1
0
forked from jengelh/openldap2

Accepting request 544643 from home:RBrownSUSE:branches:network:ldap

Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544643
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=197
This commit is contained in:
Michael Ströder 2017-11-23 14:51:00 +00:00 committed by Git OBS Bridge
parent 0f916505ad
commit e78007150a
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:36:52 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 2 18:15:46 UTC 2017 - jengelh@inai.de Mon Oct 2 18:15:46 UTC 2017 - jengelh@inai.de

View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define run_test_suite 0 %define run_test_suite 0
%define version_main 2.4.45 %define version_main 2.4.45
@ -375,8 +380,8 @@ popd
# Install ppolicy check module's manual page # Install ppolicy check module's manual page
install -m 0644 %{S:203}.gz %{buildroot}%{_mandir}/man5/ install -m 0644 %{S:203}.gz %{buildroot}%{_mandir}/man5/
mkdir -p ${RPM_BUILD_ROOT}/var/adm/fillup-templates mkdir -p ${RPM_BUILD_ROOT}%{_fillupdir}
install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.openldap install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}%{_fillupdir}/sysconfig.openldap
install -m 644 *.ldif ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema install -m 644 *.ldif ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
install -m 644 *.schema ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema install -m 644 *.schema ${RPM_BUILD_ROOT}%{_sysconfdir}/openldap/schema
# Install default and sample configuration files # Install default and sample configuration files
@ -471,7 +476,7 @@ fi
%dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap
%dir %attr(0770, ldap, ldap) %{_sysconfdir}/openldap/slapd.d %dir %attr(0770, ldap, ldap) %{_sysconfdir}/openldap/slapd.d
%dir %{_sysconfdir}/openldap/schema %dir %{_sysconfdir}/openldap/schema
/var/adm/fillup-templates/sysconfig.openldap %{_fillupdir}/sysconfig.openldap
%{_sbindir}/slap* %{_sbindir}/slap*
%{_sbindir}/rcslapd %{_sbindir}/rcslapd
%{_libdir}/openldap/back_bdb* %{_libdir}/openldap/back_bdb*