Accepting request 544664 from home:RBrownSUSE:branches:network
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544664 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=202
This commit is contained in:
parent
e5f49d0c42
commit
9ec64c1b6a
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 23 13:38:33 UTC 2017 - rbrown@suse.com
|
||||||
|
|
||||||
|
- Replace references to /var/adm/fillup-templates with new
|
||||||
|
%_fillupdir macro (boo#1069468)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Oct 2 22:53:28 UTC 2017 - jengelh@inai.de
|
Mon Oct 2 22:53:28 UTC 2017 - jengelh@inai.de
|
||||||
|
|
||||||
|
@ -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 srcRoot krb5-1.15.2
|
%define srcRoot krb5-1.15.2
|
||||||
%define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
|
%define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
|
||||||
%define krb5docdir %{_defaultdocdir}/krb5
|
%define krb5docdir %{_defaultdocdir}/krb5
|
||||||
@ -199,9 +204,9 @@ install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb
|
|||||||
install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd
|
install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd
|
||||||
%endif
|
%endif
|
||||||
# install sysconfig templates
|
# install sysconfig templates
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates
|
mkdir -p $RPM_BUILD_ROOT/%{_fillupdir}
|
||||||
install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
|
install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_fillupdir}/
|
||||||
install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
|
install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_fillupdir}/
|
||||||
# install logrotate files
|
# install logrotate files
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
||||||
install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server
|
install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server
|
||||||
@ -324,7 +329,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
|
|||||||
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
|
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
|
||||||
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
|
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
|
||||||
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
|
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
|
||||||
%{_var}/adm/fillup-templates/sysconfig.*
|
%{_fillupdir}/sysconfig.*
|
||||||
%{_unitdir}/kadmind.service
|
%{_unitdir}/kadmind.service
|
||||||
%{_unitdir}/krb5kdc.service
|
%{_unitdir}/krb5kdc.service
|
||||||
%{_unitdir}/kpropd.service
|
%{_unitdir}/kpropd.service
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 23 13:38:38 UTC 2017 - rbrown@suse.com
|
||||||
|
|
||||||
|
- Replace references to /var/adm/fillup-templates with new
|
||||||
|
%_fillupdir macro (boo#1069468)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Nov 6 10:23:00 UTC 2017 - hguo@suse.com
|
Mon Nov 6 10:23:00 UTC 2017 - hguo@suse.com
|
||||||
|
|
||||||
|
13
krb5.spec
13
krb5.spec
@ -16,6 +16,11 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||||
|
%if ! %{defined _fillupdir}
|
||||||
|
%define _fillupdir /var/adm/fillup-templates
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: krb5
|
Name: krb5
|
||||||
Url: https://web.mit.edu/kerberos/www/
|
Url: https://web.mit.edu/kerberos/www/
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -266,9 +271,9 @@ install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb
|
|||||||
install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd
|
install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd
|
||||||
%endif
|
%endif
|
||||||
# install sysconfig templates
|
# install sysconfig templates
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates
|
mkdir -p $RPM_BUILD_ROOT/%{_fillupdir}
|
||||||
install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
|
install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_fillupdir}/
|
||||||
install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
|
install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_fillupdir}/
|
||||||
# install logrotate files
|
# install logrotate files
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
|
||||||
install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server
|
install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server
|
||||||
@ -419,7 +424,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
|
|||||||
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
|
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
|
||||||
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
|
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
|
||||||
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
|
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
|
||||||
%{_var}/adm/fillup-templates/sysconfig.*
|
%{_fillupdir}/sysconfig.*
|
||||||
/usr/sbin/rc*
|
/usr/sbin/rc*
|
||||||
/usr/lib/mit/sbin/kadmin.local
|
/usr/lib/mit/sbin/kadmin.local
|
||||||
/usr/lib/mit/sbin/kadmind
|
/usr/lib/mit/sbin/kadmind
|
||||||
|
Loading…
Reference in New Issue
Block a user