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

Accepting request 236329 from home:AndreasStieger:branches:devel:tools:scm:svn

Browse Source 
do not package svnserve pid file in /var/run, fixing Factory

OBS-URL: https://build.opensuse.org/request/show/236329
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=171
This commit is contained in:
Andreas Stieger 2014-06-04 23:26:28 +00:00 committed by Git OBS Bridge
parent e8c209088c
commit 9187c38afb
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
subversion.changes
View File

@ -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 Tue May 13 17:34:59 UTC 2014 - andreas.stieger@gmx.de

11
subversion.spec
View File

@ -38,6 +38,7 @@
%define svngroup svn %define svngroup svn
%define svnuser svn %define svnuser svn
%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
Name: subversion Name: subversion
Version: 1.8.9 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 %{__install} -d -m 0755 %{buildroot}/srv/svn
%if 0%{?has_systemd} %if 0%{?has_systemd}
install -m 644 -D %{S:14} $RPM_BUILD_ROOT/%{_unitdir}/svnserve.service 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}/%{_tmpfilesdir}
%{__install} -d -m 0755 %{buildroot}/usr/lib/tmpfiles.d/ %{__install} -m 0644 %{SOURCE15} %{buildroot}/%{_tmpfilesdir}/svnserve.conf
%{__install} -m 0644 %{SOURCE15} %{buildroot}/usr/lib/tmpfiles.d/svnserve.conf
%endif %endif
#useless libtool stuff #useless libtool stuff
rm -f %{buildroot}%{_libdir}/*.la 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} %{fillup_and_insserv -n svnserve svnserve}
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_add_post svnserve.service %service_add_post svnserve.service
systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
%endif %endif
/sbin/ldconfig /sbin/ldconfig
@ -720,8 +720,7 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/svnserve.conf
%config %{_fwdefdir}/* %config %{_fwdefdir}/*
%if 0%{?has_systemd} %if 0%{?has_systemd}
%{_unitdir}/svnserve.service %{_unitdir}/svnserve.service
%ghost %dir %attr(755,%{svnuser},%{svngroup}) /var/run/svnserve %{_tmpfilesdir}/svnserve.conf
/usr/lib/tmpfiles.d/svnserve.conf
%endif %endif
# #
%attr(755,root,root) /usr/bin/svn %attr(755,root,root) /usr/bin/svn