[subversion: 1/2] switch svnserve pidfile to use /run, use /usr/lib/tmpfiles.d (#840195)
jorton
jorton at fedoraproject.org
Mon Jul 16 08:28:40 UTC 2012
commit fdfc8e1c3415a3c8d7fa114748f66423c67cd774
Author: Joe Orton <jorton at redhat.com>
Date: Mon Jul 16 09:27:06 2012 +0100
switch svnserve pidfile to use /run, use /usr/lib/tmpfiles.d (#840195)
Resolves: rhbz#840195
subversion.spec | 15 +++++++++------
svnserve.service | 2 +-
svnserve.tmpfiles | 2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index 890b45c..dfa28fb 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -26,7 +26,7 @@
Summary: A Modern Concurrent Version Control System
Name: subversion
Version: 1.7.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0
Group: Development/Tools
URL: http://subversion.apache.org/
@@ -307,14 +307,14 @@ install -Dpm 644 tools/client-side/bash_completion \
# Install svnserve bits
mkdir -p %{buildroot}%{_unitdir} \
- %{buildroot}%{_localstatedir}/run/svnserve \
- %{buildroot}%{_sysconfdir}/tmpfiles.d \
+ %{buildroot}/run/svnserve \
+ %{buildroot}%{_prefix}/lib/tmpfiles.d \
%{buildroot}%{_sysconfdir}/sysconfig
install -p -m 644 $RPM_SOURCE_DIR/svnserve.service \
%{buildroot}%{_unitdir}/svnserve.service
install -p -m 644 $RPM_SOURCE_DIR/svnserve.tmpfiles \
- %{buildroot}%{_sysconfdir}/tmpfiles.d/svnserve.conf
+ %{buildroot}%{_prefix}/lib/tmpfiles.d/svnserve.conf
install -p -m 644 $RPM_SOURCE_DIR/svnserve.sysconf \
%{buildroot}%{_sysconfdir}/sysconfig/svnserve
@@ -407,8 +407,8 @@ fi
%dir %{_sysconfdir}/subversion
%exclude %{_mandir}/man*/*::*
%{_unitdir}/*.service
-%{_localstatedir}/run/svnserve
-%{_sysconfdir}/tmpfiles.d/svnserve.conf
+%dir /run/svnserve
+%{_prefix}/lib/tmpfiles.d/svnserve.conf
%files tools -f tools.files
%defattr(-,root,root)
@@ -477,6 +477,9 @@ fi
%endif
%changelog
+* Mon Jul 16 2012 Joe Orton <jorton at redhat.com> - 1.7.5-2
+- switch svnserve pidfile to use /run, use /usr/lib/tmpfiles.d (#840195)
+
* Tue May 22 2012 Joe Orton <jorton at redhat.com> - 1.7.5-1
- update to 1.7.5
diff --git a/svnserve.service b/svnserve.service
index 78cfbda..d74ca94 100644
--- a/svnserve.service
+++ b/svnserve.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=forking
EnvironmentFile=/etc/sysconfig/svnserve
-ExecStart=/usr/bin/svnserve --daemon --pid-file=/var/run/svnserve/svnserve.pid $OPTIONS
+ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $OPTIONS
[Install]
WantedBy=multi-user.target
diff --git a/svnserve.tmpfiles b/svnserve.tmpfiles
index 041b7a0..e8487d3 100644
--- a/svnserve.tmpfiles
+++ b/svnserve.tmpfiles
@@ -1 +1 @@
-D /var/run/svnserve 0700 root root -
+D /run/svnserve 0700 root root -
More information about the scm-commits
mailing list