rpms
/
subversion
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch svnserve pidfile to use /run, use /usr/lib/tmpfiles.d (#840195) 

Resolves: rhbz#840195
This commit is contained in:
Joe Orton 2012-07-16 09:27:06 +01:00
parent 8a2548890d
commit fdfc8e1c34
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subversion.spec
View File

@ -26,7 +26,7 @@
Summary: A Modern Concurrent Version Control System Summary: A Modern Concurrent Version Control System
Name: subversion Name: subversion
Version: 1.7.5 Version: 1.7.5
Release: 1%{?dist} Release: 2%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Development/Tools Group: Development/Tools
URL: http://subversion.apache.org/ URL: http://subversion.apache.org/
@ -307,14 +307,14 @@ install -Dpm 644 tools/client-side/bash_completion \
# Install svnserve bits # Install svnserve bits
mkdir -p %{buildroot}%{_unitdir} \ mkdir -p %{buildroot}%{_unitdir} \
%{buildroot}%{_localstatedir}/run/svnserve \ %{buildroot}/run/svnserve \
%{buildroot}%{_sysconfdir}/tmpfiles.d \ %{buildroot}%{_prefix}/lib/tmpfiles.d \
%{buildroot}%{_sysconfdir}/sysconfig %{buildroot}%{_sysconfdir}/sysconfig
install -p -m 644 $RPM_SOURCE_DIR/svnserve.service \ install -p -m 644 $RPM_SOURCE_DIR/svnserve.service \
%{buildroot}%{_unitdir}/svnserve.service %{buildroot}%{_unitdir}/svnserve.service
install -p -m 644 $RPM_SOURCE_DIR/svnserve.tmpfiles \ 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 \ install -p -m 644 $RPM_SOURCE_DIR/svnserve.sysconf \
%{buildroot}%{_sysconfdir}/sysconfig/svnserve %{buildroot}%{_sysconfdir}/sysconfig/svnserve
@ -407,8 +407,8 @@ fi
%dir %{_sysconfdir}/subversion %dir %{_sysconfdir}/subversion
%exclude %{_mandir}/man*/*::* %exclude %{_mandir}/man*/*::*
%{_unitdir}/*.service %{_unitdir}/*.service
%{_localstatedir}/run/svnserve %dir /run/svnserve
%{_sysconfdir}/tmpfiles.d/svnserve.conf %{_prefix}/lib/tmpfiles.d/svnserve.conf
%files tools -f tools.files %files tools -f tools.files
%defattr(-,root,root) %defattr(-,root,root)
@ -477,6 +477,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Jul 16 2012 Joe Orton <jorton@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@redhat.com> - 1.7.5-1 * Tue May 22 2012 Joe Orton <jorton@redhat.com> - 1.7.5-1
- update to 1.7.5 - update to 1.7.5

2
svnserve.service
View File

@ -5,7 +5,7 @@ After=syslog.target network.target
[Service] [Service]
Type=forking Type=forking
EnvironmentFile=/etc/sysconfig/svnserve 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] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
svnserve.tmpfiles
View File

@ -1 +1 @@
D /var/run/svnserve 0700 root root - D /run/svnserve 0700 root root -