--- nss_ldap.spec.orig 2006-06-12 01:30:52 +0400 +++ nss_ldap.spec 2006-07-24 18:47:19 +0400 @@ -4,7 +4,7 @@ Name: nss_ldap Version: 244 -Release: alt5.1 +Release: alt1 Summary: NSS library for LDAP Summary(ru_RU.KOI8-R): Библиотека NSS для LDAP @@ -21,6 +21,7 @@ Patch2: %name-210-explode_rdn-alt.patch #Patch3: %name-210-segfault-alt.patch #Patch4: %name-211-db4-alt.patch +Patch5: libdir.fix Requires: nscd @@ -45,6 +46,7 @@ #patch2 -p1 #%patch3 -p1 #%patch4 -p1 +%patch5 -p1 ### ## Install Attention README @@ -52,8 +54,7 @@ install -m 0644 %SOURCE1 README.ALT %build -aclocal -autoconf +autoreconf -fisv %configure \ --with-ldap-conf-file=%_sysconfdir/nss_ldap.conf \ @@ -71,20 +72,20 @@ %endif -%make_build +%make_build SYSLIBDIR=/%_lib %make check %install -mkdir -p $RPM_BUILD_ROOT{%_sysconfdir,/lib,%_libdir} +mkdir -p $RPM_BUILD_ROOT{%_sysconfdir,%_libdir,/%_lib} # Install the nsswitch module. -%make_install install \ - DESTDIR=$RPM_BUILD_ROOT \ +%make_install SYSLIBDIR=/%_lib install \ + DESTDIR=%buildroot \ INST_UID=`id -un` INST_GID=`id -gn` -mv $RPM_BUILD_ROOT%_libdir/* $RPM_BUILD_ROOT/lib/ -chmod 755 $RPM_BUILD_ROOT/lib/*.so* +mv $RPM_BUILD_ROOT%_libdir/* $RPM_BUILD_ROOT/%_lib/ +chmod 755 $RPM_BUILD_ROOT/%_lib/*.so* # Install /etc/nss_ldap.conf, becouse in nss_ldap and pam_ldap we have two the same files /etc/ldap.conf as a config files # Install the default configuration file, but change the search bases to @@ -95,7 +96,7 @@ rm -f $RPM_BUILD_ROOT%_sysconfdir/ldap.conf %files -/lib/*.so* +/%_lib/*.so* %config(noreplace) %_sysconfdir/nss_ldap.conf %doc ANNOUNCE AUTHORS ChangeLog NEWS README %doc nsswitch.ldap