Hello community, here is the log from the commit of package vpnc for openSUSE:Factory checked in at 2014-09-28 19:56:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vpnc (Old) and /work/SRC/openSUSE:Factory/.vpnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vpnc" Changes: -------- --- /work/SRC/openSUSE:Factory/vpnc/vpnc.changes 2014-05-22 20:38:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vpnc.new/vpnc.changes 2014-09-28 19:56:43.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 23 15:22:31 UTC 2014 - [email protected] + +- Add unit file +- Fix building for SLE_11_SP3 +- Clean specfile + +------------------------------------------------------------------- New: ---- vpnc.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vpnc.spec ++++++ --- /var/tmp/diff_new_pack.mdVHlP/_old 2014-09-28 19:56:44.000000000 +0200 +++ /var/tmp/diff_new_pack.mdVHlP/_new 2014-09-28 19:56:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vpnc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,35 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if ! %{defined _rundir} %define _rundir %{_localstatedir}/run %endif - - Name: vpnc -BuildRequires: gnutls -BuildRequires: libgcrypt-devel -BuildRequires: libgnutls-devel -BuildRequires: pkg-config -BuildRequires: pkgconfig(systemd) Version: 0.5.3r517 Release: 0 Summary: A Client for Cisco VPN concentrator License: GPL-2.0+ Group: Productivity/Networking/Security Url: http://svn.unix-ag.uni-kl.de/vpnc/branches/vpnc-nortel -Requires: /sbin/ip -Requires: /usr/bin/sed Source: %{name}-%{version}.tar.bz2 # only for checkin warnings... Source1: checkout_svn.sh -Source2: vpnc.conf +Source2: %{name}.conf +Source3: %{name}.service Patch1: vpnc-no-build-dates.patch # most ugly hack ever Patch4: vpnc-restart-after-timeout.diff Patch5: vpnc-pidfile-path.diff Patch6: vpnc-add-name-to-stderr-log.diff +BuildRequires: gnutls +BuildRequires: libgcrypt-devel +BuildRequires: libgnutls-devel +BuildRequires: pkg-config +Requires: %{_bindir}/sed +Requires: /sbin/ip BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1210 +BuildRequires: pkgconfig(systemd) +%endif %description A VPN client compatible with Cisco's EasyVPN equipment. @@ -58,42 +60,55 @@ It runs entirely in userspace and uses the TUN/TAP driver for access. - - -Authors: --------- - Maurice Massar <vpnc at unix-ag dot uni-kl dot de> - Eduard Bloch <blade at debian dot org> - %prep -%setup -n %{name} +%setup -q -n %{name} %patch1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build -export CFLAGS="%optflags" -make PREFIX=/usr +export CFLAGS="%{optflags}" +make PREFIX=/usr %{?_smp_mflags} %install -mkdir -p ${RPM_BUILD_ROOT}/%{_rundir}/vpnc -%{__make} install \ - DESTDIR=${RPM_BUILD_ROOT} \ +mkdir -p %{buildroot}/%{_rundir}/vpnc +make install \ + DESTDIR=%{buildroot} \ PREFIX=/usr -rm -rfv ${RPM_BUILD_ROOT}/usr/share/doc/vpnc -install -D -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_prefix}/lib/tmpfiles.d/vpnc.conf +rm -rfv %{buildroot}%{_datadir}/doc/vpnc +%if 0%{?suse_version} >= 1210 +install -D -m 0644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}@.service +install -D -m 0644 $RPM_SOURCE_DIR/%{name}.conf %{buildroot}/%{_libexecdir}/tmpfiles.d/%{name}.conf +%endif + +%pre +%if 0%{?suse_version} >= 1210 +%service_add_pre %{name}@.service +%endif -%clean -rm -rf %{buildroot} +%post +%if 0%{?suse_version} >= 1210 +%service_add_post %{name}@.service +%endif + +%preun +%if 0%{?suse_version} >= 1210 +%service_del_preun %{name}@.service +%endif + +%postun +%if 0%{?suse_version} >= 1210 +%service_del_postun %{name}@.service +%endif %files %defattr(-,root,root) -%attr(0600,root,root) %config(noreplace) %ghost %{_sysconfdir}/vpnc/default.conf -%{_prefix}/lib/tmpfiles.d/vpnc.conf +%attr(0600,root,root) %config(noreplace) %ghost %{_sysconfdir}/%{name}/default.conf + %ghost %{_rundir}/vpnc -%dir %{_sysconfdir}/vpnc -%{_sysconfdir}/vpnc/vpnc-script +%dir %{_sysconfdir}/%{name} +%{_sysconfdir}/%{name}/vpnc-script %{_sbindir}/vpnc %{_sbindir}/vpnc-disconnect %{_bindir}/cisco-decrypt @@ -101,6 +116,10 @@ %{_mandir}/man1/cisco-decrypt.1.* %{_mandir}/man1/pcf2vpnc.1.* %{_mandir}/man8/vpnc.8.* +%if 0%{?suse_version} >= 1210 +%{_unitdir}/%{name}@.service +%{_libexecdir}/tmpfiles.d/%{name}.conf +%endif %doc ChangeLog COPYING README TODO VERSION %changelog ++++++ vpnc.service ++++++ [Unit] Description=VPNC connection to %i Documentation=man:vpnc(8) http://www.unix-ag.uni-kl.de/~massar/vpnc/ Requires=network.target After=network.target [Service] Type=forking ExecStart=/usr/sbin/vpnc --pid-file=/run/vpnc@%i.pid /etc/vpnc/%i.conf PIDFile=/run/vpnc@%i.pid [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
