From 897060147ddea72ecc1e86c6b7b915ff1d462f71 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 19 May 2009 14:03:14 -0400 Subject: Fix RPM generation issues with sssd Ensures that the common libraries build statically. Also ensures that the sssd.spec creates the SYSV init script with the appropriate permissions. Cleans up the useless rpmdist target that was obsolete. Adds the *.so.N.0.0 files to the RPM, as the .so and .so.N files were dangling symlinks. --- Makefile.am | 6 +----- common/collection/configure.ac | 7 +++++-- common/dhash/configure.ac | 4 ++-- common/ini/configure.ac | 4 ++-- server/configure.ac | 2 +- sss_client/configure.ac | 2 +- sssd.spec.in | 19 ++++--------------- 7 files changed, 16 insertions(+), 28 deletions(-) diff --git a/Makefile.am b/Makefile.am index 60d739e8..9030b10d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,11 +14,7 @@ rpmroot: mkdir -p $(RPMBUILD)/SPECS mkdir -p $(RPMBUILD)/SRPMS -rpmdistdir: - mkdir -p dist/rpms - mkdir -p dist/srpms - -rpms: dist-gzip rpmroot rpmdistdir +rpms: dist-gzip rpmroot cp $(builddir)/sssd.spec $(RPMBUILD)/SPECS cp $(distdir).tar.gz $(RPMBUILD)/SOURCES cd $(RPMBUILD); rpmbuild --define "_topdir $(RPMBUILD)" -ba SPECS/sssd.spec diff --git a/common/collection/configure.ac b/common/collection/configure.ac index 573b45e9..ed51593d 100644 --- a/common/collection/configure.ac +++ b/common/collection/configure.ac @@ -1,9 +1,12 @@ -AC_INIT([collection], [0.3.3], [freeipa-devel@redhat.com]) +AC_INIT([collection],[0.3.3],[freeipa-devel@redhat.com]) AC_CONFIG_SRCDIR([collection.c]) AC_CONFIG_AUX_DIR([build]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_PROG_CC -AC_PROG_LIBTOOL + +#Until the API is stabilized, we'll statically link +LT_INIT([disable-shared]) + AC_CONFIG_MACRO_DIR([m4]) AC_PROG_INSTALL diff --git a/common/dhash/configure.ac b/common/dhash/configure.ac index 13fd1ac7..1cfd4b01 100644 --- a/common/dhash/configure.ac +++ b/common/dhash/configure.ac @@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([dhash.c]) AC_CONFIG_AUX_DIR([build]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_PROG_CC -AC_PROG_LIBTOOL +LT_INIT([disable-shared]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_INSTALL @@ -17,4 +17,4 @@ AC_ARG_ENABLE([trace], AS_IF([test ["$trace_level" -gt "0"] -a ["$trace_level" -lt "8"] ],[AC_SUBST([TRACE_VAR],["-DTRACE_LEVEL=$trace_level"])]) AC_CONFIG_FILES([Makefile dhash.pc]) -AC_OUTPUT \ No newline at end of file +AC_OUTPUT diff --git a/common/ini/configure.ac b/common/ini/configure.ac index 5a88c9fa..63fb1168 100644 --- a/common/ini/configure.ac +++ b/common/ini/configure.ac @@ -1,9 +1,9 @@ -AC_INIT([ini_config], [0.3.3], [freeipa-devel@redhat.com]) +AC_INIT([ini_config],[0.3.3],[freeipa-devel@redhat.com]) AC_CONFIG_SRCDIR([ini_config.c]) AC_CONFIG_AUX_DIR([build]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AC_PROG_CC -AC_PROG_LIBTOOL +LT_INIT([disable-shared]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_INSTALL diff --git a/server/configure.ac b/server/configure.ac index b6f5ab2e..f0a1e436 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -17,7 +17,7 @@ AC_CONFIG_AUX_DIR([build]) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) AM_PROG_CC_C_O -AC_PROG_LIBTOOL +LT_INIT([disable-static]) AC_CONFIG_MACRO_DIR([m4]) if test "$ac_cv_prog_gcc" = yes; then diff --git a/sss_client/configure.ac b/sss_client/configure.ac index b168d041..c9bb9412 100644 --- a/sss_client/configure.ac +++ b/sss_client/configure.ac @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) AC_CONFIG_AUX_DIR([build]) AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) AM_PROG_CC_C_O -AC_PROG_LIBTOOL +LT_INIT([disable-static]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST(PAM_LIBS) diff --git a/sssd.spec.in b/sssd.spec.in index dd5cb4dd..886812da 100644 --- a/sssd.spec.in +++ b/sssd.spec.in @@ -71,13 +71,8 @@ make install DESTDIR=$RPM_BUILD_ROOT # Delete files that we do not want to package for now # Eventually some of these will be added to a -devel package rm -f \ - $RPM_BUILD_ROOT/%{_lib}/libnss_sss.a \ $RPM_BUILD_ROOT/%{_lib}/libnss_sss.la \ - $RPM_BUILD_ROOT/%{_lib}/libnss_sss.so.2.0.0 \ - $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.a \ $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.la \ - $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.so.1 \ - $RPM_BUILD_ROOT/%{_lib}/security/pam_sss.so.1.0.0 \ $RPM_BUILD_ROOT/%{_includedir}/collection.h \ $RPM_BUILD_ROOT/%{_includedir}/collection_tools.h \ $RPM_BUILD_ROOT/%{_includedir}/dhash.h \ @@ -87,19 +82,10 @@ rm -f \ $RPM_BUILD_ROOT/%{_libdir}/ldb/memberof.la \ $RPM_BUILD_ROOT/%{_libdir}/libcollection.a \ $RPM_BUILD_ROOT/%{_libdir}/libcollection.la \ - $RPM_BUILD_ROOT/%{_libdir}/libcollection.so \ - $RPM_BUILD_ROOT/%{_libdir}/libcollection.so.0 \ - $RPM_BUILD_ROOT/%{_libdir}/libcollection.so.0.0.0 \ $RPM_BUILD_ROOT/%{_libdir}/libdhash.a \ $RPM_BUILD_ROOT/%{_libdir}/libdhash.la \ - $RPM_BUILD_ROOT/%{_libdir}/libdhash.so \ - $RPM_BUILD_ROOT/%{_libdir}/libdhash.so.0 \ - $RPM_BUILD_ROOT/%{_libdir}/libdhash.so.0.0.0 \ $RPM_BUILD_ROOT/%{_libdir}/libini_config.a \ $RPM_BUILD_ROOT/%{_libdir}/libini_config.la \ - $RPM_BUILD_ROOT/%{_libdir}/libini_config.so \ - $RPM_BUILD_ROOT/%{_libdir}/libini_config.so.0 \ - $RPM_BUILD_ROOT/%{_libdir}/libini_config.so.0.0.0 \ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/collection.pc \ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/dhash.pc \ $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/ini_config.pc \ @@ -116,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING -%{_initrddir}/%{name} +%attr(755,root,root) %{_initrddir}/%{name} %{_sbindir}/sssd %{_sbindir}/sss_useradd %{_sbindir}/sss_userdel @@ -130,7 +116,10 @@ rm -rf $RPM_BUILD_ROOT %{_sharedstatedir}/sss/ /%{_lib}/libnss_sss.so /%{_lib}/libnss_sss.so.2 +/%{_lib}/libnss_sss.so.2.0.0 /%{_lib}/security/pam_sss.so +/%{_lib}/security/pam_sss.so.1 +/%{_lib}/security/pam_sss.so.1.0.0 %{_mandir}/man8/* %post -- cgit