Accepting request 233444 from home:coolo:branches:openSUSE:Factory

- use %_rundir macro

OBS-URL: https://build.opensuse.org/request/show/233444
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=110
This commit is contained in:
Dr. Werner Fink 2014-05-11 09:55:03 +00:00 committed by Git OBS Bridge
parent ab5930074f
commit 79d92f7e70
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun May 11 05:28:49 UTC 2014 - coolo@suse.com
- use %_rundir macro
-------------------------------------------------------------------
Wed Jan 15 14:12:57 UTC 2014 - werner@suse.de

View File

@ -19,6 +19,9 @@
Name: syslogd
%define omc_prefix /usr/share/omc
%define omc_svcdir %{omc_prefix}/svcinfo.d
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
BuildRequires: pkg-config
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
@ -184,7 +187,7 @@ mv sample-s390.conf sample.conf
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{5,8}
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p $RPM_BUILD_ROOT%{sysdsysunitdir}
mkdir -p -m 0755 $RPM_BUILD_ROOT/var/run/syslogd
mkdir -p -m 0755 $RPM_BUILD_ROOT/%{_rundir}/syslogd
make install MANDIR=%{_mandir} BINDIR=%{_sbindir} DESTDIR=$RPM_BUILD_ROOT
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/logrotate.d/syslog
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates
@ -293,7 +296,7 @@ rm -f /etc/systemd/system/multi-user.target.wants/syslog.service
%doc %{_mandir}/man8/sysklogd.8.gz
%config %{sysdsysunitdir}/syslogd.service
%{_sbindir}/syslogd-service-prepare
%attr(0755,root,root) %dir %ghost /var/run/syslogd
%attr(0755,root,root) %dir %ghost %{_rundir}/syslogd
/usr/sbin/syslogd
/sbin/syslogd