Build SSSD RPMs with external libraries

1 files changed, 8 insertions, 225 deletions

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 8f5e1df85..0477f6816 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -13,12 +13,6 @@ URL: http://fedorahosted.org/sssd/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-%global dhash_version 0.4.0
-%global path_utils_version 0.2.0
-%global collection_version 0.5.0
-%global ini_config_version 0.6.0
-%global refarray_version 0.1.0
-
 ### Patches ###
 
 ### Dependencies ###
@@ -26,9 +20,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: libldb >= 0.9.3
 Requires: libtdb >= 1.1.3
 Requires: sssd-client = %{version}-%{release}
-Requires: libdhash >= %{dhash_version}
-Requires: libcollection >= %{collection_version}
-Requires: libini_config >= %{ini_config_version}
 Requires: cyrus-sasl-gssapi
 Requires: keyutils-libs
 Requires(post): python
@@ -58,6 +49,9 @@ BuildRequires: libtalloc-devel
 BuildRequires: libtevent-devel
 BuildRequires: libtdb-devel
 BuildRequires: libldb-devel
+BuildRequires: libdhash-devel
+BuildRequires: libcollection-devel
+BuildRequires: libini_config-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-libs
 BuildRequires: openldap-devel
@@ -78,6 +72,7 @@ BuildRequires: libsemanage-devel
 BuildRequires: bind-utils
 BuildRequires: keyutils-libs-devel
 BuildRequires: libnl-devel
+BuildRequires: nscd
 
 %description
 Provides a set of daemons to manage access to remote directories and
@@ -95,108 +90,6 @@ License: LGPLv3+
 Provides the libraries needed by the PAM and NSS stacks to connect to the SSSD
 service.
 
-%package -n libdhash
-Summary: Dynamic hash table
-Group: Development/Libraries
-Version: %{dhash_version}
-License: LGPLv3+
-
-%description -n libdhash
-A hash table which will dynamically resize to achieve optimal storage & access
-time properties
-
-%package -n libdhash-devel
-Summary: Development files for libdhash
-Group: Development/Libraries
-Version: %{dhash_version}
-Requires: libdhash = %{dhash_version}-%{release}
-License: LGPLv3+
-
-%description -n libdhash-devel
-A hash table which will dynamically resize to achieve optimal storage & access
-time properties
-
-%package -n libpath_utils
-Summary: Filesystem Path Utilities
-Group: Development/Libraries
-Version: %{path_utils_version}
-License: LGPLv3+
-
-%description -n libpath_utils
-Utility functions to manipulate filesystem pathnames
-
-%package -n libpath_utils-devel
-Summary: Development files for libpath_utils
-Group: Development/Libraries
-Version: %{path_utils_version}
-Requires: libpath_utils = %{path_utils_version}-%{release}
-License: LGPLv3+
-
-%description -n libpath_utils-devel
-Utility functions to manipulate filesystem pathnames
-
-%package -n libcollection
-Summary: Collection data-type for C
-Group: Development/Libraries
-Version: %{collection_version}
-License: LGPLv3+
-
-%description -n libcollection
-A data-type to collect data in a heirarchical structure for easy iteration
-and serialization
-
-%package -n libcollection-devel
-Summary: Development files for libcollection
-Group: Development/Libraries
-Version: %{collection_version}
-Requires: libcollection = %{collection_version}-%{release}
-License: LGPLv3+
-
-%description -n libcollection-devel
-A data-type to collect data in a heirarchical structure for easy iteration
-and serialization
-
-%package -n libini_config
-Summary: INI file parser for C
-Group: Development/Libraries
-Version: %{ini_config_version}
-Requires: libcollection >= %{collection_version}
-License: LGPLv3+
-
-%description -n libini_config
-Library to process config files in INI format into a libcollection data
-structure
-
-%package -n libini_config-devel
-Summary: Development files for libini_config
-Group: Development/Libraries
-Version: %{ini_config_version}
-Requires: libini_config = %{ini_config_version}-%{release}
-License: LGPLv3+
-
-%description -n libini_config-devel
-Library to process config files in INI format into a libcollection data
-structure
-
-%package -n libref_array
-Summary: A refcounted array for C
-Group: Development/Libraries
-Version: %{refarray_version}
-License: LGPLv3+
-
-%description -n libref_array
-A dynamically-growing, reference-counted array
-
-%package -n libref_array-devel
-Summary: Development files for libref_array
-Group: Development/Libraries
-Version: %{refarray_version}
-Requires: libref_array = %{refarray_version}-%{release}
-License: LGPLv3+
-
-%description -n libref_array-devel
-A dynamically-growing, reference-counted array
-
 %prep
 %setup -q
 
@@ -212,10 +105,6 @@ A dynamically-growing, reference-counted array
 
 make %{?_smp_mflags}
 
-pushd common
-make %{?_smp_mflags} docs
-popd
-
 %check
 make %{?_smp_mflags} check
 
@@ -224,16 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# Remove the example files from the output directory
-# We will copy them directly from the source directory
-# for packaging
-rm -f \
-    $RPM_BUILD_ROOT/usr/share/doc/dhash/README \
-    $RPM_BUILD_ROOT/usr/share/doc/dhash/examples/dhash_example.c \
-    $RPM_BUILD_ROOT/usr/share/doc/dhash/examples/dhash_test.c
-
 # Prepare language files
-/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sss_daemon
+/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT sssd
 
 # Copy default sssd.conf file
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sssd
@@ -253,11 +134,6 @@ install -m644 src/examples/rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/sssd
 rm -f \
     $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \
     $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.la \
-    $RPM_BUILD_ROOT/%{_libdir}/libdhash.la \
-    $RPM_BUILD_ROOT/%{_libdir}/libpath_utils.la \
-    $RPM_BUILD_ROOT/%{_libdir}/libcollection.la \
-    $RPM_BUILD_ROOT/%{_libdir}/libini_config.la \
-    $RPM_BUILD_ROOT/%{_libdir}/libref_array.la \
     $RPM_BUILD_ROOT/%{_libdir}/ldb/memberof.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_ldap.la \
     $RPM_BUILD_ROOT/%{_libdir}/sssd/libsss_proxy.la \
@@ -271,17 +147,17 @@ if test -e $RPM_BUILD_ROOT/%{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plu
 then
     # Apppend this file to the sss_daemon.lang
     # Older versions of rpmbuild can only handle one -f option
-    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sss_daemon.lang
+    echo %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so >> sssd.lang
 fi
 for file in `ls $RPM_BUILD_ROOT/%{python_sitelib}/*.egg-info 2> /dev/null`
 do
-    echo %{python_sitelib}/`basename $file` >> sss_daemon.lang
+    echo %{python_sitelib}/`basename $file` >> sssd.lang
 done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f sss_daemon.lang
+%files -f sssd.lang
 %defattr(-,root,root,-)
 %doc COPYING
 %{_initrddir}/%{name}
@@ -334,83 +210,6 @@ rm -rf $RPM_BUILD_ROOT
 /%{_lib}/security/pam_sss.so
 %{_mandir}/man8/pam_sss.8*
 
-%files -n libdhash
-%defattr(-,root,root,-)
-%doc common/dhash/COPYING
-%doc common/dhash/COPYING.LESSER
-%{_libdir}/libdhash.so.1
-%{_libdir}/libdhash.so.1.0.0
-
-%files -n libdhash-devel
-%defattr(-,root,root,-)
-%{_includedir}/dhash.h
-%{_libdir}/libdhash.so
-%{_libdir}/pkgconfig/dhash.pc
-%doc common/dhash/README
-%doc common/dhash/examples
-
-%files -n libpath_utils
-%defattr(-,root,root,-)
-%doc common/path_utils/COPYING
-%doc common/path_utils/COPYING.LESSER
-%{_libdir}/libpath_utils.so.1
-%{_libdir}/libpath_utils.so.1.0.0
-
-%files -n libpath_utils-devel
-%defattr(-,root,root,-)
-%{_includedir}/path_utils.h
-%{_libdir}/libpath_utils.so
-%{_libdir}/pkgconfig/path_utils.pc
-%doc common/path_utils/README
-%doc common/path_utils/doc/html/
-
-%files -n libcollection
-%defattr(-,root,root,-)
-%doc common/collection/COPYING
-%doc common/collection/COPYING.LESSER
-%{_libdir}/libcollection.so.2
-%{_libdir}/libcollection.so.2.0.0
-
-%files -n libcollection-devel
-%defattr(-,root,root,-)
-%{_includedir}/collection.h
-%{_includedir}/collection_tools.h
-%{_includedir}/collection_queue.h
-%{_includedir}/collection_stack.h
-%{_libdir}/libcollection.so
-%{_libdir}/pkgconfig/collection.pc
-%doc common/collection/doc/html/
-
-%files -n libini_config
-%defattr(-,root,root,-)
-%doc common/ini/COPYING
-%doc common/ini/COPYING.LESSER
-%{_libdir}/libini_config.so.2
-%{_libdir}/libini_config.so.2.0.0
-
-%files -n libini_config-devel
-%defattr(-,root,root,-)
-%{_includedir}/ini_config.h
-%{_libdir}/libini_config.so
-%{_libdir}/pkgconfig/ini_config.pc
-%doc common/ini/doc/html/
-
-%files -n libref_array
-%defattr(-,root,root,-)
-%doc common/refarray/COPYING
-%doc common/refarray/COPYING.LESSER
-%{_libdir}/libref_array.so.1
-%{_libdir}/libref_array.so.1.0.0
-
-%files -n libref_array-devel
-%defattr(-,root,root,-)
-%{_includedir}/ref_array.h
-%{_libdir}/libref_array.so
-%{_libdir}/pkgconfig/ref_array.pc
-%doc common/refarray/README
-%doc common/refarray/doc/html/
-
-
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add %{servicename}
@@ -435,22 +234,6 @@ fi
 
 %postun client -p /sbin/ldconfig
 
-%post -n libdhash -p /sbin/ldconfig
-
-%postun -n libdhash -p /sbin/ldconfig
-
-%post -n libpath_utils -p /sbin/ldconfig
-%postun -n libpath_utils -p /sbin/ldconfig
-
-%post -n libcollection -p /sbin/ldconfig
-%postun -n libcollection -p /sbin/ldconfig
-
-%post -n libini_config -p /sbin/ldconfig
-%postun -n libini_config -p /sbin/ldconfig
-
-%post -n libref_array -p /sbin/ldconfig
-%postun -n libref_array -p /sbin/ldconfig
-
 %changelog
 * Mon Mar 15 2010 Stephen Gallagher <sgallagh@redhat.com> - @PACKAGE_VERSION@-0@PRERELEASE_VERSION@
 - Automated build of the SSSD