From 19b4b4470bedc9cc0622630c599e22385a162c39dac6fd7da5b066830ba312f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Str=C3=B6der?= Date: Mon, 8 Jun 2020 13:44:06 +0000 Subject: [PATCH] Accepting request 812601 from home:gmbr3:branches:Base:System3 - Revert changes to libexecdir OBS-URL: https://build.opensuse.org/request/show/812601 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=262 --- openldap2.changes | 5 +++ openldap2.spec | 107 +++++++++++++++++++++++----------------------- 2 files changed, 58 insertions(+), 54 deletions(-) diff --git a/openldap2.changes b/openldap2.changes index 7845b3f..ef68669 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 8 12:46:34 UTC 2020 - Callum Farmer + +- Revert changes to libexecdir + ------------------------------------------------------------------- Sun Jun 7 10:20:45 UTC 2020 - Michael Ströder diff --git a/openldap2.spec b/openldap2.spec index 712992e..6cb4acf 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -276,7 +276,7 @@ export STRIP="" --prefix=/usr \ --sysconfdir=%{_sysconfdir} \ --libdir=%{_libdir} \ - --libexecdir=%{_libexecdir} \ + --libexecdir=%{_libdir} \ --localstatedir=%{_rundir} \ --enable-wrappers=no \ --enable-spasswd \ @@ -311,13 +311,13 @@ make %{?_smp_mflags} # Build selected contrib overlays for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/argon2 passwd/sha2 passwd/pbkdf2 trace do - make -C contrib/slapd-modules/${SLAPO_NAME} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" + make -C contrib/slapd-modules/${SLAPO_NAME} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" done # slapo-smbk5pwd only for Samba password hashes -make -C contrib/slapd-modules/smbk5pwd %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" DEFS="-DDO_SAMBA" HEIMDAL_LIB="" +make -C contrib/slapd-modules/smbk5pwd %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" DEFS="-DDO_SAMBA" HEIMDAL_LIB="" # Build ppolicy-check-password module -make -C contrib/slapd-modules/%{name_ppolicy_check_module} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" +make -C contrib/slapd-modules/%{name_ppolicy_check_module} %{?_smp_mflags} "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" %check %if %run_test_suite @@ -349,16 +349,16 @@ mkdir -p %{buildroot}%{_libdir}/openldap mkdir -p %{buildroot}/usr/lib/openldap mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_unitdir} -make STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install +make STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install # Additional symbolic link to slapd executable in /usr/sbin/ -ln -s %{_libexecdir}/slapd %{buildroot}%{_sbindir}/slapd +ln -s %{_libdir}/slapd %{buildroot}%{_sbindir}/slapd # Install selected contrib overlays for SLAPO_NAME in addpartial allowed allop autogroup lastbind denyop cloak noopsrch passwd/argon2 passwd/sha2 passwd/pbkdf2 trace do - make -C contrib/slapd-modules/${SLAPO_NAME} STRIP="" DESTDIR="%{buildroot}" "mandir=%{_mandir}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install + make -C contrib/slapd-modules/${SLAPO_NAME} STRIP="" DESTDIR="%{buildroot}" "mandir=%{_mandir}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install done # slapo-smbk5pwd only for Samba password hashes -make -C contrib/slapd-modules/smbk5pwd STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install +make -C contrib/slapd-modules/smbk5pwd STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libdir}" install install -m 755 %{SOURCE13} %{buildroot}/usr/lib/openldap/start install -m 644 %{SOURCE14} %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_sysconfdir}/openldap/slapd.d @@ -478,7 +478,6 @@ fi %config(noreplace) %attr(640, ldap, ldap) /usr/lib/openldap/DB_CONFIG %dir %{_libdir}/openldap %dir /usr/lib/openldap -%dir %{_libexecdir}/openldap %dir %{_sysconfdir}/sasl2 %dir %{_sysconfdir}/openldap %dir %attr(0770, ldap, ldap) %{_sysconfdir}/openldap/slapd.d @@ -487,34 +486,34 @@ fi %{_sbindir}/slap* %{_sbindir}/rcslapd %{_sbindir}/openldap_update_modules_path.sh -%{_libexecdir}/openldap/back_bdb* -%{_libexecdir}/openldap/back_hdb* -%{_libexecdir}/openldap/back_ldap* -%{_libexecdir}/openldap/back_mdb* -%{_libexecdir}/openldap/back_monitor* -%{_libexecdir}/openldap/back_relay* -%{_libexecdir}/openldap/accesslog* -%{_libexecdir}/openldap/auditlog* -%{_libexecdir}/openldap/collect* -%{_libexecdir}/openldap/constraint* -%{_libexecdir}/openldap/dds* -%{_libexecdir}/openldap/deref* -%{_libexecdir}/openldap/dyngroup* -%{_libexecdir}/openldap/dynlist* -%{_libexecdir}/openldap/memberof* -%{_libexecdir}/openldap/pcache* -%{_libexecdir}/openldap/ppolicy-2.4.* -%{_libexecdir}/openldap/ppolicy.* -%{_libexecdir}/openldap/refint* -%{_libexecdir}/openldap/retcode* -%{_libexecdir}/openldap/rwm* -%{_libexecdir}/openldap/seqmod* -%{_libexecdir}/openldap/sssvlv* -%{_libexecdir}/openldap/syncprov* -%{_libexecdir}/openldap/translucent* -%{_libexecdir}/openldap/unique* -%{_libexecdir}/openldap/valsort* -%{_libexecdir}/slapd +%{_libdir}/openldap/back_bdb* +%{_libdir}/openldap/back_hdb* +%{_libdir}/openldap/back_ldap* +%{_libdir}/openldap/back_mdb* +%{_libdir}/openldap/back_monitor* +%{_libdir}/openldap/back_relay* +%{_libdir}/openldap/accesslog* +%{_libdir}/openldap/auditlog* +%{_libdir}/openldap/collect* +%{_libdir}/openldap/constraint* +%{_libdir}/openldap/dds* +%{_libdir}/openldap/deref* +%{_libdir}/openldap/dyngroup* +%{_libdir}/openldap/dynlist* +%{_libdir}/openldap/memberof* +%{_libdir}/openldap/pcache* +%{_libdir}/openldap/ppolicy-2.4.* +%{_libdir}/openldap/ppolicy.* +%{_libdir}/openldap/refint* +%{_libdir}/openldap/retcode* +%{_libdir}/openldap/rwm* +%{_libdir}/openldap/seqmod* +%{_libdir}/openldap/sssvlv* +%{_libdir}/openldap/syncprov* +%{_libdir}/openldap/translucent* +%{_libdir}/openldap/unique* +%{_libdir}/openldap/valsort* +%{_libdir}/slapd /usr/lib/openldap/start %{_unitdir}/slapd.service %{_tmpfilesdir}/%{name}.conf @@ -542,22 +541,22 @@ fi %files back-perl %defattr(-,root,root) -%{_libexecdir}/openldap/back_perl* +%{_libdir}/openldap/back_perl* %doc %{_mandir}/man5/slapd-perl.* %files back-sock %defattr(-,root,root) -%{_libexecdir}/openldap/back_sock* +%{_libdir}/openldap/back_sock* %doc %{_mandir}/man5/slapd-sock.* %files back-meta %defattr(-,root,root) -%{_libexecdir}/openldap/back_meta* +%{_libdir}/openldap/back_meta* %doc %{_mandir}/man5/slapd-meta.* %files back-sql %defattr(-,root,root) -%{_libexecdir}/openldap/back_sql* +%{_libdir}/openldap/back_sql* %doc %{_mandir}/man5/slapd-sql.* %doc servers/slapd/back-sql/examples %doc servers/slapd/back-sql/docs/bugs @@ -578,19 +577,19 @@ fi %files contrib %defattr(-,root,root) -%{_libexecdir}/openldap/addpartial.* -%{_libexecdir}/openldap/allowed.* -%{_libexecdir}/openldap/allop.* -%{_libexecdir}/openldap/autogroup.* -%{_libexecdir}/openldap/lastbind.* -%{_libexecdir}/openldap/noopsrch.* -%{_libexecdir}/openldap/pw-argon2.* -%{_libexecdir}/openldap/pw-sha2.* -%{_libexecdir}/openldap/pw-pbkdf2.* -%{_libexecdir}/openldap/denyop.* -%{_libexecdir}/openldap/cloak.* -%{_libexecdir}/openldap/smbk5pwd.* -%{_libexecdir}/openldap/trace.* +%{_libdir}/openldap/addpartial.* +%{_libdir}/openldap/allowed.* +%{_libdir}/openldap/allop.* +%{_libdir}/openldap/autogroup.* +%{_libdir}/openldap/lastbind.* +%{_libdir}/openldap/noopsrch.* +%{_libdir}/openldap/pw-argon2.* +%{_libdir}/openldap/pw-sha2.* +%{_libdir}/openldap/pw-pbkdf2.* +%{_libdir}/openldap/denyop.* +%{_libdir}/openldap/cloak.* +%{_libdir}/openldap/smbk5pwd.* +%{_libdir}/openldap/trace.* %doc %{_mandir}/man5/slapd-pw-argon2.* %files client