Hello community,
here is the log from the commit of package pptpd for openSUSE:Factory checked
in at 2012-02-14 19:05:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pptpd (Old)
and /work/SRC/openSUSE:Factory/.pptpd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pptpd", Maintainer is "b...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pptpd/pptpd.changes 2011-12-21
10:03:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pptpd.new/pptpd.changes 2012-02-14
19:05:56.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Dec 20 03:59:47 UTC 2011 - crrodrig...@opensuse.org
+
+- Add native systemd units
+
+-------------------------------------------------------------------
New:
----
pptpd.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pptpd.spec ++++++
--- /var/tmp/diff_new_pack.g22t0t/_old 2012-02-14 19:05:57.000000000 +0100
+++ /var/tmp/diff_new_pack.g22t0t/_new 2012-02-14 19:05:57.000000000 +0100
@@ -16,6 +16,7 @@
#
+
Name: pptpd
Version: 1.3.4
Release: 0
@@ -30,6 +31,7 @@
Source5: options.ppp0
Source7: README.SuSE
Source8: LIESMICH.SuSE
+Source9: pptpd.service
Patch0: makefile.diff
Patch1: pptpd-cflags.patch
Patch2: pptpd-pptpd-logwtmp-version.patch
@@ -39,6 +41,11 @@
BuildRequires: automake
BuildRequires: ppp-devel
Requires: ppp
+%if 0%{?suse_version} > 1140
+BuildRequires: systemd
+%{?systemd_requires}
+%define has_systemd 1
+%endif
%description
PoPToP is a PPTP(Point-to-Point Tunneling Protocol) server solution for
@@ -79,19 +86,40 @@
ln -sf ../../etc/init.d/pptpd %{buildroot}/usr/sbin/rcpptpd
find {samples,PPTP-Installation,pptp-server} -type f -exec chmod -x {} +
chmod -x AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+mkdir -p %{buildroot}/usr/lib/modules-load.d
+
+%if 0%{?has_systemd}
+install -D -m 0644 %{S:9} %{buildroot}%{_unitdir}/`basename %{S:9}`
+mkdir -p %{buildroot}/usr/lib/modules-load.d
+echo "ppp_mppe" > %{buildroot}/usr/lib/modules-load.d/pptpd.conf
+%endif
%clean
rm -rf %{buildroot}
+%pre
+%if 0%{?has_systemd}
+%service_add_pre %{name}.service
+%endif
+
%preun
%stop_on_removal pptpd
+%if 0%{?has_systemd}
+%service_del_preun %{name}.service
+%endif
%post
%{fillup_and_insserv pptpd}
+%if 0%{?has_systemd}
+%service_add_post %{name}.service
+%endif
%postun
%restart_on_update pptpd
%{insserv_cleanup}
+%if 0%{?has_systemd}
+%service_del_postun %{name}.service
+%endif
%files
%defattr (-, root, root)
@@ -107,5 +135,9 @@
/usr/sbin/bcrelay
/usr/lib/pptpd
/etc/init.d/pptpd
+%if 0%{?has_systemd}
+%{_unitdir}/%{name}.service
+/usr/lib/modules-load.d/pptpd.conf
+%endif
%changelog
++++++ pptpd.service ++++++
[Unit]
Description=PPTP Daemon
After=network.target
[Service]
ExecStart=/usr/sbin/pptpd --fg
StandardOutput=null
[Install]
WantedBy=multi-user.target--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
