rpms/NetworkManager-vpnc/devel .cvsignore, 1.6, 1.7 NetworkManager-vpnc.spec, 1.10, 1.11 sources, 1.6, 1.7 nm-vpnc-0.6.0-rekeying.patch, 1.1, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6264

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Removed Files:
	nm-vpnc-0.6.0-rekeying.patch 
Log Message:
* Sun May 21 2006 Dan Williams <dcbw at redhat.com> 0.7.0-0.cvs20060521
- Update to CVS snapshot
- Honor user-specified rekeying intervals




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 May 2006 15:03:46 -0000	1.6
+++ .cvsignore	21 May 2006 20:40:19 -0000	1.7
@@ -3,3 +3,4 @@
 NetworkManager-vpnc-0.5.0.tar.gz
 NetworkManager-vpnc-0.6.0.tar.gz
 NetworkManager-vpnc-0.6.2.tar.gz
+NetworkManager-vpnc-0.7.0.cvs20060521.tar.gz


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NetworkManager-vpnc.spec	15 May 2006 15:03:46 -0000	1.10
+++ NetworkManager-vpnc.spec	21 May 2006 20:40:19 -0000	1.11
@@ -1,16 +1,22 @@
-%define nm_version          0.6.2
+%define nm_version          0.7.0
 %define dbus_version        0.60
 %define gtk2_version        2.6.0
 %define vpnc_version        0.3.3-3
 %define shared_mime_version 0.16-3
 
+%define cvs_snapshot 1
+
+%if %{cvs_snapshot}
+%define nm_vpnc_cvs_version	.cvs20060521
+%endif
+
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
-Version: 0.6.2
-Release: 1%{?dist}
+Version: 0.7.0
+Release: 0%{?nm_vpnc_cvs_version}%{?dist}
 License: GPL
 Group: System Environment/Base
-Source: %{name}-%{version}.tar.gz
+Source: %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
@@ -32,15 +38,12 @@
 Requires: gnome-keyring
 Requires: libglade2
 
-Patch1: nm-vpnc-0.6.0-rekeying.patch
-
 %description
 This package contains software for integrating the vpnc VPN software
 with NetworkManager and the GNOME desktop
 
 %prep
 %setup -q
-%patch1 -p1 -b .rekeying
 
 %build
 %configure
@@ -87,6 +90,10 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Sun May 21 2006 Dan Williams <dcbw at redhat.com> 0.7.0-0.cvs20060521
+- Update to CVS snapshot
+- Honor user-specified rekeying intervals
+
 * Mon May 15 2006 Dan Williams <dcbw at redhat.com> 0.6.2-1
 - New release for NM 0.6.2 compat
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 May 2006 15:03:46 -0000	1.6
+++ sources	21 May 2006 20:40:19 -0000	1.7
@@ -1 +1 @@
-638045ff8bb5b587a59e579bd036cc1a  NetworkManager-vpnc-0.6.2.tar.gz
+ea25752ca514d5e6f6acf6a797d44b82  NetworkManager-vpnc-0.7.0.cvs20060521.tar.gz


--- nm-vpnc-0.6.0-rekeying.patch DELETED ---