rpms/vpnc/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vpnc-0.3.2-pie.patch, 1.1, 1.2 vpnc.spec, 1.5, 1.6 vpnc-0.3.2-64bit.patch, 1.1, NONE

[Tomas Mraz (tmraz)]

Author: tmraz

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

Modified Files:
	.cvsignore sources vpnc-0.3.2-pie.patch vpnc.spec 
Removed Files:
	vpnc-0.3.2-64bit.patch 
Log Message:
* Mon May 16 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-1
- new upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Dec 2004 20:46:38 -0000	1.2
+++ .cvsignore	16 May 2005 09:48:46 -0000	1.3
@@ -1 +1,2 @@
-vpnc-0.3.2.tar.gz
+vpnc-0.3.3.tar.gz
+clog


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Dec 2004 20:46:38 -0000	1.2
+++ sources	16 May 2005 09:48:46 -0000	1.3
@@ -1 +1 @@
-aaccdffc5656095a45dfe87c5bf612cb  vpnc-0.3.2.tar.gz
+e7518cff21326fe7eb9795b60c25ae6a  vpnc-0.3.3.tar.gz

vpnc-0.3.2-pie.patch:

Index: vpnc-0.3.2-pie.patch
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc-0.3.2-pie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpnc-0.3.2-pie.patch	24 Dec 2004 03:16:24 -0000	1.1
+++ vpnc-0.3.2-pie.patch	16 May 2005 09:48:46 -0000	1.2
@@ -6,7 +6,7 @@
  
  CC=gcc
 -CFLAGS=-W -Wall -O -g '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags)
-+CFLAGS=-W -Wall -O2 -g -fpie -pie '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags)
++CFLAGS=-W -Wall $(RPM_OPT_FLAGS) -fpie -pie '-DVERSION="$(shell cat VERSION)"' $(shell libgcrypt-config --cflags)
  LDFLAGS=-g $(shell libgcrypt-config --libs)
  
  ifeq ($(shell uname -s), Linux)


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vpnc.spec	6 Apr 2005 22:13:35 -0000	1.5
+++ vpnc.spec	16 May 2005 09:48:46 -0000	1.6
@@ -1,16 +1,15 @@
 Name:           vpnc
-Version:        0.3.2
-Release:        4
+Version:        0.3.3
+Release:        1
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.unix-ag.uni-kl.de/~massar/vpnc/
-Source0:        vpnc-0.3.2.tar.gz
+Source0:        vpnc-0.3.3.tar.gz
 Source1:        generic-vpnc.conf
 Patch0:         vpnc-0.3.2-pie.patch
-Patch1:         vpnc-0.3.2-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
@@ -25,17 +24,16 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-make
+make PREFIX=/usr
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/{sbin,etc}
+make install DESTDIR="$RPM_BUILD_ROOT" PREFIX=/usr
+install -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/default.conf
+rm $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/vpnc.conf
 
-install -m 755 vpnc $RPM_BUILD_ROOT/sbin
-install -m 600 %{SOURCE1} $RPM_BUILD_ROOT/etc/vpnc.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -43,11 +41,16 @@
 %files
 %defattr(-,root,root)
 %doc README
-%dev(c, 10, 200) /dev/tun
-%config(noreplace) /etc/vpnc.conf
-/sbin/*
+
+%config(noreplace) %{_sysconfdir}/vpnc/default.conf
+%{_sbindir}/*
+%{_sysconfdir}/vpnc
+%{_mandir}/man8/*
 
 %changelog
+* Mon May 16 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-1
+- new upstream version
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


--- vpnc-0.3.2-64bit.patch DELETED ---