[vpnc] Make it build

[Tomáš Mráz]

commit 5af538110d9bbd76816ed9d14dcd2ad5064b4feb
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Thu Mar 7 13:50:34 2013 +0100

    Make it build
    
    - Remove vpnc-cleanup upstart configuration file

 vpnc-0.5.3-use-autodie.patch |   12 ++++++++++++
 vpnc-cleanup                 |   14 --------------
 vpnc.spec                    |   13 ++++++++-----
 3 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/vpnc-0.5.3-use-autodie.patch b/vpnc-0.5.3-use-autodie.patch
new file mode 100644
index 0000000..4ad5d6c
--- /dev/null
+++ b/vpnc-0.5.3-use-autodie.patch
@@ -0,0 +1,12 @@
+diff -up vpnc-0.5.3/makeman.pl.autodie vpnc-0.5.3/makeman.pl
+--- vpnc-0.5.3/makeman.pl.autodie	2009-11-19 18:03:47.000000000 +0100
++++ vpnc-0.5.3/makeman.pl	2013-03-07 11:21:43.524106709 +0100
+@@ -17,7 +17,7 @@
+ 
+ use strict;
+ use warnings;
+-use Fatal    qw(open close);
++use autodie  qw(open close);
+ use filetest qw(access);	# to always get errno-values on filetests
+ use POSIX    qw(strftime setlocale LC_ALL);
+ 
diff --git a/vpnc.spec b/vpnc.spec
index ae0db5a..f386396 100644
--- a/vpnc.spec
+++ b/vpnc.spec
@@ -2,7 +2,7 @@
 
 Name:		vpnc
 Version:	0.5.3
-Release:	16%{snapshot}%{?dist}
+Release:	17%{snapshot}%{?dist}
 
 Summary:	IPSec VPN client compatible with Cisco equipment
 
@@ -15,16 +15,17 @@ Source2:	vpnc.consolehelper
 Source3:	vpnc-disconnect.consolehelper
 Source4:	vpnc.pam
 Source5:	vpnc-helper
-Source6:	vpnc-cleanup
 # vpnc-script based on http://git.infradead.org/users/dwmw2/vpnc-scripts.git
 # local changes sent upstream
 Source7:	vpnc-script
 Source8:	%{name}-tmpfiles.conf
 
 Patch1:		vpnc-0.5.1-dpd.patch
+Patch2:		vpnc-0.5.3-use-autodie.patch
 
 BuildRequires:	libgcrypt-devel > 1.1.90
 BuildRequires:	gnutls-devel
+BuildRequires:	perl(autodie)
 Requires:	iproute vpnc-script
 Requires:	initscripts
 
@@ -57,6 +58,7 @@ or openconnect.
 %prep
 %setup -q
 %patch1 -p1 -b .dpd
+%patch2 -p1 -b .autodie
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
@@ -83,8 +85,6 @@ install -m 0755 %{SOURCE7} \
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc-disconnect
-install -Dp -m 0644 %{SOURCE6} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/init/vpnc-cleanup.conf
 rm -f $RPM_BUILD_ROOT%{_datadir}/doc/vpnc/COPYING
 
 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
@@ -99,7 +99,6 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
 
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
-%config(noreplace) %{_sysconfdir}/init/vpnc-cleanup.conf
 %{_sbindir}/vpnc
 %{_bindir}/cisco-decrypt
 %{_sbindir}/vpnc-disconnect
@@ -120,6 +119,10 @@ install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
 %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
 
 %changelog
+* Thu Mar  7 2013 Tomáš Mráz <tmraz at redhat.com> - 0.5.3-17.svn457
+- Make it build
+- Remove vpnc-cleanup upstart configuration file
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-16.svn457
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild