X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=openvpn.spec;h=f8dfcbac4abfe3e77345fea3e98f68bd3a5ed2e4;hb=198beee9b15742a578260bd417f2653b5d045c8a;hp=70eddeb51bf4ec048afe75c9295769287c6d6ab4;hpb=005d29067c8f1f75225446b1859b74f2f96fdf7d;p=packages%2Fopenvpn.git

diff --git a/openvpn.spec b/openvpn.spec
index 70eddeb..f8dfcba 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -13,10 +13,7 @@ Source0:	http://swupdate.openvpn.net/community/releases/%{name}-%{version}.tar.g
 # Source0-md5:	6ca03fe0fd093e0d01601abee808835c
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Source3:	%{name}.tmpfiles
-Source4:	openvpn-service-generator
-Source5:	openvpn.target
-Source6:	openvpn@.service
+Source3:	%{name}-update-resolv-conf
 Patch0:		%{name}-pam.patch
 URL:		http://www.openvpn.net/
 BuildRequires:	autoconf >= 2.59
@@ -27,12 +24,9 @@ BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pam-devel
 %{?with_pkcs11:BuildRequires:	pkcs11-helper-devel}
 BuildRequires:	rpmbuild(macros) >= 1.671
-BuildRequires:	systemd-devel
 Requires(post,preun):	/sbin/chkconfig
-Requires(post,preun,postun):	systemd-units >= 38
 Requires:	/sbin/ip
 Requires:	rc-scripts >= 0.4.3.0
-Requires:	systemd-units >= 38
 Conflicts:	kernel < 2.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -78,7 +72,6 @@ sed -e 's,/''usr/lib/openvpn,%{_libdir}/%{name},' %{SOURCE3} > contrib/update-re
 	--enable-password-save \
 	--enable-iproute2 \
 	--enable-selinux \
-	--enable-systemd \
 	IFCONFIG=/sbin/ifconfig \
 	IPROUTE=/sbin/ip \
 	ROUTE=/sbin/route \
@@ -90,20 +83,13 @@ sed -e 's,/''usr/lib/openvpn,%{_libdir}/%{name},' %{SOURCE3} > contrib/update-re
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/openvpn,%{_sbindir},%{_mandir}/man8} \
 	$RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/var/run/openvpn,%{_includedir}} \
-	$RPM_BUILD_ROOT{%{_libdir}/%{name}/plugins,%{systemdtmpfilesdir},%{systemdunitdir}} \
-	$RPM_BUILD_ROOT/lib/systemd/system-generators
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-
-install -p %{SOURCE4} $RPM_BUILD_ROOT/lib/systemd/system-generators/openvpn-service-generator
-install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/openvpn.target
-install -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/openvpn@.service
-ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/openvpn.service
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
 
@@ -113,25 +99,12 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add openvpn
 %service openvpn restart "OpenVPN"
-%systemd_post openvpn.target
 
 %preun
 if [ "$1" = "0" ]; then
 	%service openvpn stop
 	/sbin/chkconfig --del openvpn
 fi
-%systemd_preun openvpn.target
-
-%postun
-%systemd_reload
-
-%triggerpostun -- openvpn < 2.3.2-2
-[ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm
-[ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && exit 0
-[ "$(echo /etc/rc.d/rc[0-6].d/S[0-9][0-9]openvpn)" = "/etc/rc.d/rc[0-6].d/S[0-9][0-9]openvpn" ] && exit 0
-export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog
-/bin/systemctl --quiet enable openvpn.target || :
-exit 0
 
 %files
 %defattr(644,root,root,755)
@@ -141,16 +114,11 @@ exit 0
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(755,root,root) %{_sbindir}/openvpn
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(755,root,root) /lib/systemd/system-generators/%{name}-service-generator
-%{systemdunitdir}/%{name}.service
-%{systemdunitdir}/%{name}.target
-%{systemdunitdir}/%{name}@.service
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 %{_mandir}/man8/openvpn.8*
 %dir /var/run/openvpn
-/usr/lib/tmpfiles.d/%{name}.conf
 
 %files devel
 %defattr(644,root,root,755)