diff --git a/openvpn.changes b/openvpn.changes index ed30a28..3cbe290 100644 --- a/openvpn.changes +++ b/openvpn.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 26 14:38:48 UTC 2013 - aj@suse.com + +- Remove _unitdir definition, it is provided by systemd. +- Install service file without x permissions + ------------------------------------------------------------------- Mon Mar 25 14:55:35 UTC 2013 - p.drouand@gmail.com diff --git a/openvpn.spec b/openvpn.spec index bfeda7a..026f7c1 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -16,12 +16,6 @@ # -%if 0%{?suse_version} < 1230 -%define _unitdir /lib/systemd/system -%else -%define _unitdir /usr/lib/systemd/system -%endif - %if 0%{?suse_version} > 1210 %define with_systemd 1 %else @@ -156,7 +150,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/openvpn mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn %if %{with_systemd} -install -D -m 755 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}.service +install -D -m 644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}.service # tmpfiles.d mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d install -m 0644 $RPM_SOURCE_DIR/%{name}-tmpfile.conf %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf