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

- use %_rundir for %ghost directory - leaving /var/run everywhere
  else

OBS-URL: https://build.opensuse.org/request/show/233447
OBS-URL: https://build.opensuse.org/package/show/network:vpn/openvpn?expand=0&rev=75
This commit is contained in:
Tomáš Chvátal 2014-05-19 11:56:09 +00:00 committed by Git OBS Bridge
parent 01bef909c4
commit 0943a7a494
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun May 11 07:58:52 UTC 2014 - coolo@suse.com
- use %_rundir for %ghost directory - leaving /var/run everywhere
else
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 14 10:43:19 UTC 2014 - mt@suse.de Tue Jan 14 10:43:19 UTC 2014 - mt@suse.de

View File

@ -21,6 +21,9 @@
%else %else
%define with_systemd 0 %define with_systemd 0
%endif %endif
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
Name: openvpn Name: openvpn
Url: http://openvpn.net/ Url: http://openvpn.net/
@ -153,7 +156,7 @@ make
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/openvpn mkdir -p $RPM_BUILD_ROOT/%{_rundir}/openvpn
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn
%if %{with_systemd} %if %{with_systemd}
install -D -m 644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}@.service install -D -m 644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}@.service
@ -178,7 +181,7 @@ install -m 755 $RPM_SOURCE_DIR/client-netconfig.down sample/sample-scripts/clien
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name}
%post %post
%__mkdir_p -m750 %{_localstatedir}/run/openvpn %__mkdir_p -m750 %{_rundir}/openvpn
%if %{with_systemd} %if %{with_systemd}
%service_add_post %{name}.target %service_add_post %{name}.target
# try to migrate openvpn.service autostart to openvpn@<CONF>.service # try to migrate openvpn.service autostart to openvpn@<CONF>.service
@ -255,7 +258,7 @@ rm -f /etc/sysconfig/openvpn || :
%endif %endif
%{_sbindir}/rcopenvpn %{_sbindir}/rcopenvpn
%{_sbindir}/openvpn %{_sbindir}/openvpn
%attr(0750,root,root) %dir %ghost %{_localstatedir}/run/openvpn %attr(0750,root,root) %dir %ghost %{_rundir}/openvpn
%{_includedir}/%{name}-plugin.h %{_includedir}/%{name}-plugin.h
%files down-root-plugin %files down-root-plugin