Hello community, here is the log from the commit of package nss_ldap for openSUSE:Factory checked in at 2015-09-08 17:39:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nss_ldap (Old) and /work/SRC/openSUSE:Factory/.nss_ldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nss_ldap" Changes: -------- --- /work/SRC/openSUSE:Factory/nss_ldap/nss_ldap.changes 2014-11-10 17:29:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nss_ldap.new/nss_ldap.changes 2015-09-08 17:44:06.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Sep 2 11:01:16 UTC 2015 - mplus...@suse.com + +- Use %configure macro +- Remove unrecognized configure options + * --enable-schema-mapping, + * --enable-xad +- Use url for source +- Update dependencies on autotools +- Use Requires(pre) in spec file + +------------------------------------------------------------------- Old: ---- nss_ldap-265.tar.bz2 New: ---- nss_ldap-265.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss_ldap.spec ++++++ --- /var/tmp/diff_new_pack.3TU06i/_old 2015-09-08 17:44:07.000000000 +0200 +++ /var/tmp/diff_new_pack.3TU06i/_new 2015-09-08 17:44:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nss_ldap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,27 +17,17 @@ Name: nss_ldap -BuildRequires: automake -BuildRequires: db-devel -BuildRequires: krb5-devel -BuildRequires: openldap2-devel -PreReq: sed coreutils /usr/bin/grep /bin/mktemp -# bug437293 -%ifarch ppc64 -Obsoletes: nss_ldap-64bit -%endif -# Version: 265 Release: 0 Summary: NSS LDAP Module License: LGPL-2.1+ Group: Productivity/Networking/LDAP/Clients Url: http://www.padl.com/OSS/nss_ldap.html -Source: nss_ldap-%{version}.tar.bz2 +Source: http://www.padl.com/download/nss_ldap-%{version}.tar.gz Source1: README.SUSE Source2: baselibs.conf Source3: ldap.conf -Patch: nss_ldap.dif +Patch0: nss_ldap.dif Patch1: group-utf8.dif Patch2: nss_ldap-ldapconn-leak-bug418.dif Patch3: nss_ldap-getent-retry.dif @@ -50,6 +40,16 @@ Patch7: bnc#842120.dif # reverse ipv6 host lookups fail when ldap is used Patch8: bnc#866763.dif +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: db-devel +BuildRequires: krb5-devel +BuildRequires: libtool +BuildRequires: openldap2-devel +Requires(pre): %{_bindir}/grep +Requires(pre): /bin/mktemp +Requires(pre): coreutils +Requires(pre): sed BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,7 +60,7 @@ %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -69,48 +69,39 @@ %patch6 %patch7 -p1 %patch8 -p1 -cp -v %{S:1} . +cp -v %{SOURCE1} . %build autoreconf -fiv -CFLAGS="$RPM_OPT_FLAGS" \ -CPPFLAGS="-I/usr/include/sasl -DINET6" \ -./configure --prefix=/usr \ - --mandir=%{_mandir} \ +CPPFLAGS="-I/usr/include/sasl -DINET6" +%configure \ --enable-rfc2307bis \ - --enable-schema-mapping \ - --enable-xad \ --enable-paged-results \ --enable-configurable-krb5-ccname-gssapi \ - --libdir=%{_libdir} \ - --sysconfdir=/etc \ - --x-libraries=/usr/X11R6/%{_lib} -make + --x-libraries=%{_prefix}/X11R6/%{_lib} +make %{?_smp_mflags} %install -mkdir -p $RPM_BUILD_ROOT/%{_lib} -mkdir -p $RPM_BUILD_ROOT%{_libdir} -install -m 755 nss_ldap.so $RPM_BUILD_ROOT/%{_lib}/libnss_ldap.so.2 -install -d 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ -install -m 644 %{S:3} $RPM_BUILD_ROOT/%{_sysconfdir}/ -make DESTDIR=$RPM_BUILD_ROOT install-man - -%clean -rm -fr $RPM_BUILD_ROOT +mkdir -p %{buildroot}/%{_lib} +mkdir -p %{buildroot}%{_libdir} +install -m 755 nss_ldap.so %{buildroot}/%{_lib}/libnss_ldap.so.2 +install -d 755 %{buildroot}/%{_sysconfdir}/ +install -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/ +make DESTDIR=%{buildroot} install-man %pre # If we have a /etc/ldap.conf.rpmsave, and no /etc/ldap.conf, # backup the rpmsave file and use that later instead of our # own version. This fixes the problem that the file was moved # from pwdutils to nss_ldap and else the changes would go lost. -if [ ! -e /etc/ldap.conf -a -f /etc/ldap.conf.rpmsave ]; then - cp -p /etc/ldap.conf.rpmsave /etc/...ldap.conf.pwdutils +if [ ! -e %{_sysconfdir}/ldap.conf -a -f %{_sysconfdir}/ldap.conf.rpmsave ]; then + cp -p %{_sysconfdir}/ldap.conf.rpmsave %{_sysconfdir}/...ldap.conf.pwdutils fi %post /sbin/ldconfig # If we backuped ldap.conf, move now the backup in place -test -f /etc/...ldap.conf.pwdutils && mv /etc/...ldap.conf.pwdutils /etc/ldap.conf ||: +test -f %{_sysconfdir}/...ldap.conf.pwdutils && mv %{_sysconfdir}/...ldap.conf.pwdutils %{_sysconfdir}/ldap.conf ||: %postun -p /sbin/ldconfig @@ -119,6 +110,6 @@ %config(noreplace) %{_sysconfdir}/ldap.conf %doc ANNOUNCE AUTHORS COPYING ChangeLog NEWS README README.SUSE nsswitch.ldap ldap.conf doc/README.paged /%{_lib}/libnss_ldap.so.2 -%doc %{_mandir}/man5/nss_ldap.5* +%{_mandir}/man5/nss_ldap.5* %changelog
