rpm: Fold libsss_sudo and libsss_autofs back into the main SSSD package

https://fedorahosted.org/sssd/ticket/1845

libsss_sudo and libsss_autofs are separate packages that contain just a
single client library with no additional dependencies. This separation
comes from the F-17 timeframe where the feature was really just a tech
preview so we didn't want it to be packaged in sssd proper. On the other
hand users are getting regularly confused about "sudo not working" when
all they really miss is the single library.

This patch moves the files owned by the libsss_autofs and libsss_sudo
packages back to the main sssd package. We also no longer build the
libsss_sudo documentation by default and do not ship the header file as
it was just a private one.

2 files changed, 13 insertions, 57 deletions

diff --git a/Makefile.am b/Makefile.am
index a201abf2..6b039735 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -483,6 +483,7 @@ dist_noinst_HEADERS = \
     src/tests/cmocka/common_mock.h \
     src/tests/cmocka/common_mock_resp.h \
     src/sss_client/ssh/sss_ssh_client.h \
+    src/sss_client/sudo/sss_sudo.h \
     src/lib/idmap/sss_idmap_private.h
 
 
@@ -1370,8 +1371,6 @@ libsss_sudo_la_LDFLAGS = \
 
 sudolib_LTLIBRARIES = libsss_sudo.la
 
-include_HEADERS += \
-    src/sss_client/sudo/sss_sudo.h
 endif
 
 if BUILD_AUTOFS
@@ -1850,9 +1849,6 @@ docs:
 	$(DOXYGEN) src/doxy.config
 	$(DOXYGEN) src/providers/ipa/ipa_hbac.doxy
 	$(DOXYGEN) src/lib/idmap/sss_idmap.doxy
-if BUILD_SUDO
-	$(DOXYGEN) src/sss_client/sudo/sss_sudo.doxy
-endif BUILD_SUDO
 	$(DOXYGEN) src/sss_client/idmap/sss_nss_idmap.doxy
 else !HAVE_DOXYGEN
 docs:
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 0ad83a48..65832166 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -73,6 +73,14 @@ Requires(preun):  initscripts chkconfig
 Requires(postun): initscripts chkconfig
 %endif
 
+### Provides ###
+Provides: libsss_sudo = %{version}-%{release}
+Obsoletes: libsss_sudo < %{version}-%{release}
+Provides: libsss_sudo-devel = %{version}-%{release}
+Obsoletes: libsss_sudo-devel < %{version}-%{release}
+Provides: libsss_autofs = %{version}-%{release}
+Obsoletes: libsss_autofs < %{version}-%{release}
+
 %global servicename sssd
 %global sssdstatedir %{_localstatedir}/lib/sss
 %global dbpath %{sssdstatedir}/db
@@ -259,26 +267,6 @@ Requires: libsss_nss_idmap = %{version}-%{release}
 The libsss_nss_idmap-python contains the bindings so that libsss_nss_idmap can
 be used by Python applications.
 
-%package -n libsss_sudo
-Summary: A library to allow communication between SUDO and SSSD
-Group: Development/Libraries
-License: LGPLv3+
-Requires: sssd = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-
-%description -n libsss_sudo
-A utility library to allow communication between SUDO and SSSD
-
-%package -n libsss_sudo-devel
-Summary: A library to allow communication between SUDO and SSSD
-Group: Development/Libraries
-License: LGPLv3+
-Requires: libsss_sudo = %{version}-%{release}
-
-%description -n libsss_sudo-devel
-A utility library to allow communication between SUDO and SSSD
-
 %prep
 %setup -q
 %if (0%{?fedora} >= 17)
@@ -439,6 +427,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libsss_ldap_common.so
 %{_libdir}/%{name}/libsss_util.so
 
+# 3rd party application libraries
+%{_libdir}/sssd/modules/libsss_autofs.so
+%{_libdir}/libsss_sudo.so
+
 %{ldb_modulesdir}/memberof.so
 %{_bindir}/sss_ssh_authorizedkeys
 %{_bindir}/sss_ssh_knownhostsproxy
@@ -572,38 +564,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{python_sitearch}/pysss_nss_idmap.so
 
-%package -n libsss_autofs
-Summary: A library to allow communication between Autofs and SSSD
-Group: Development/Libraries
-License: LGPLv3+
-
-%description -n libsss_autofs
-A utility library to allow communication between Autofs and SSSD
-
 %files -n libipa_hbac-python
 %defattr(-,root,root,-)
 %{python_sitearch}/pyhbac.so
 
-%files -n libsss_sudo
-%defattr(-,root,root,-)
-%doc src/sss_client/COPYING src/sss_client/COPYING.LESSER
-%{_libdir}/libsss_sudo.so*
-
-%files -n libsss_sudo-devel
-%defattr(-,root,root,-)
-%if 0%{?fedora}
-%doc libsss_sudo_doc/html
-%endif
-%if 0%{?rhel} >= 6
-%doc libsss_sudo_doc/html
-%endif
-%{_includedir}/sss_sudo.h
-
-%files -n libsss_autofs
-%defattr(-,root,root,-)
-%doc src/sss_client/COPYING src/sss_client/COPYING.LESSER
-%{_libdir}/sssd/modules/libsss_autofs.so*
-
 %if (0%{?use_systemd} == 1)
 # systemd
 %post
@@ -666,10 +630,6 @@ fi
 
 %postun -n libsss_idmap -p /sbin/ldconfig
 
-%post -n libsss_sudo -p /sbin/ldconfig
-
-%postun -n libsss_sudo -p /sbin/ldconfig
-
 %changelog
 * Mon Mar 15 2010 Stephen Gallagher <sgallagh@redhat.com> - @PACKAGE_VERSION@-0@PRERELEASE_VERSION@
 - Automated build of the SSSD