diff --git a/subversion.changes b/subversion.changes index 42f1d59..2afddda 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 4 22:30:27 UTC 2014 - andreas.stieger@gmx.de + +- do not package svnserve pid file in /var/run, fixing Factory + ------------------------------------------------------------------- Tue May 13 17:34:59 UTC 2014 - andreas.stieger@gmx.de diff --git a/subversion.spec b/subversion.spec index aee258e..fb25a37 100644 --- a/subversion.spec +++ b/subversion.spec @@ -38,6 +38,7 @@ %define svngroup svn %define svnuser svn +%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} Name: subversion Version: 1.8.9 @@ -580,9 +581,8 @@ install -m 644 -D %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve %{__install} -d -m 0755 %{buildroot}/srv/svn %if 0%{?has_systemd} install -m 644 -D %{S:14} $RPM_BUILD_ROOT/%{_unitdir}/svnserve.service -%{__install} -d -m 0755 %{buildroot}/var/run/svnserve/ -%{__install} -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/ -%{__install} -m 0644 %{SOURCE15} %{buildroot}/usr/lib/tmpfiles.d/svnserve.conf +%{__install} -d -m 0755 %{buildroot}/%{_tmpfilesdir} +%{__install} -m 0644 %{SOURCE15} %{buildroot}/%{_tmpfilesdir}/svnserve.conf %endif #useless libtool stuff rm -f %{buildroot}%{_libdir}/*.la @@ -672,7 +672,7 @@ getent passwd %{svnuser} >/dev/null || useradd -r -g %{svngroup} -d /srv/svn -s %{fillup_and_insserv -n svnserve svnserve} %if 0%{?has_systemd} %service_add_post svnserve.service -systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf +systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf %endif /sbin/ldconfig @@ -720,8 +720,7 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf %config %{_fwdefdir}/* %if 0%{?has_systemd} %{_unitdir}/svnserve.service -%ghost %dir %attr(755,%{svnuser},%{svngroup}) /var/run/svnserve -/usr/lib/tmpfiles.d/svnserve.conf +%{_tmpfilesdir}/svnserve.conf %endif # %attr(755,root,root) /usr/bin/svn