pool/syslogd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 544703 from home:RBrownSUSE:branches:Base:System

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

OBS-URL: https://build.opensuse.org/request/show/544703
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=140
This commit is contained in:
Dirk Mueller 2017-11-24 10:00:44 +00:00 committed by Git OBS Bridge
parent 100722decc
commit 3c6a47d136
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
syslogd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:42:15 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 6 09:34:44 UTC 2017 - werner@suse.de Thu Apr 6 09:34:44 UTC 2017 - werner@suse.de

21
syslogd.spec
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
%if ! %{defined _rundir} %if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run %define _rundir %{_localstatedir}/run
%endif %endif
@ -164,26 +169,26 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/sbin
mkdir -p %{buildroot}/%{_sbindir} mkdir -p %{buildroot}/%{_sbindir}
mkdir -p %{buildroot}/%{_mandir}/man{5,8} mkdir -p %{buildroot}/%{_mandir}/man{5,8}
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
mkdir -p -m 0755 %{buildroot}/%{_rundir}/syslogd mkdir -p -m 0755 %{buildroot}/%{_rundir}/syslogd
make install MANDIR=%{_mandir} BINDIR=%{_sbindir} DESTDIR=%{buildroot} make install MANDIR=%{_mandir} BINDIR=%{_sbindir} DESTDIR=%{buildroot}
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/syslog install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
install -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}
install -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 644 %{SOURCE3} %{buildroot}%{_fillupdir}
install -m 644 %{SOURCE5} %{buildroot}/%{_mandir}/man8/syslog.8 install -m 644 %{SOURCE5} %{buildroot}/%{_mandir}/man8/syslog.8
install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/ install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/
install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/ install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/
install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/ install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/
install -m 755 %{SOURCE9} %{buildroot}/%{_sbindir}/ install -m 755 %{SOURCE9} %{buildroot}/%{_sbindir}/
install -m 755 %{SOURCE10} %{buildroot}/sbin/rcsyslog install -m 755 %{SOURCE10} %{buildroot}/sbin/rcsyslog
install -m 755 %{SOURCE12} %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 755 %{SOURCE12} %{buildroot}%{_fillupdir}
for sbin in klogd syslogd ; do for sbin in klogd syslogd ; do
ln -sf %{_sbindir}/${sbin} %{buildroot}/sbin/${sbin} ln -sf %{_sbindir}/${sbin} %{buildroot}/sbin/${sbin}
done done
%ifarch s390 s390x %ifarch s390 s390x
sed -i 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' \ sed -i 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' \
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.klogd %{buildroot}%{_fillupdir}/sysconfig.klogd
%endif %endif
%if %{defined verify_permissions} %if %{defined verify_permissions}
@ -280,7 +285,7 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_localstatedir}/adm/fillup-templates/sysconfig.syslogd %{_fillupdir}/sysconfig.syslogd
%config %verify(not mode) %{_sysconfdir}/syslog.conf %config %verify(not mode) %{_sysconfdir}/syslog.conf
%{_mandir}/man5/syslog.conf.5%{ext_man} %{_mandir}/man5/syslog.conf.5%{ext_man}
%{_mandir}/man8/syslogd.8%{ext_man} %{_mandir}/man8/syslogd.8%{ext_man}
@ -293,7 +298,7 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
%files -n klogd %files -n klogd
%defattr(-,root,root) %defattr(-,root,root)
%{_localstatedir}/adm/fillup-templates/sysconfig.klogd %{_fillupdir}/sysconfig.klogd
%{_unitdir}/klogd.service %{_unitdir}/klogd.service
%{_mandir}/man8/klogd.8%{ext_man} %{_mandir}/man8/klogd.8%{ext_man}
%{_sbindir}/klogd %{_sbindir}/klogd
@ -301,7 +306,7 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
%files -n syslog-service %files -n syslog-service
%defattr(-,root,root) %defattr(-,root,root)
%{_localstatedir}/adm/fillup-templates/sysconfig.boot %{_fillupdir}/sysconfig.boot
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
%{_unitdir}/klog.service %{_unitdir}/klog.service
%{_mandir}/man8/syslog.8%{ext_man} %{_mandir}/man8/syslog.8%{ext_man}