rpms/NetworkManager-vpnc/devel .cvsignore, 1.8, 1.9 NetworkManager-vpnc.spec, 1.16, 1.17 sources, 1.8, 1.9

[Denis Leroy (denis)]

Author: denis

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

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Log Message:
Update to CVS snapshot 060929. Some rpmlint cleanup


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 May 2006 05:12:51 -0000	1.8
+++ .cvsignore	2 Oct 2006 23:13:54 -0000	1.9
@@ -1,7 +1 @@
-NetworkManager-vpnc-0.2.tar.gz
-NetworkManager-vpnc-0.3.tar.gz
-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
-NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz
+NetworkManager-vpnc-0.7.0.cvs20060929.tar.gz


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- NetworkManager-vpnc.spec	28 Sep 2006 23:30:45 -0000	1.16
+++ NetworkManager-vpnc.spec	2 Oct 2006 23:13:54 -0000	1.17
@@ -7,17 +7,19 @@
 %define cvs_snapshot 1
 
 %if %{cvs_snapshot}
-%define nm_vpnc_cvs_version	.cvs20060529
+%define nm_vpnc_cvs_version .cvs20060929
 %endif
 
-Summary: NetworkManager VPN integration for vpnc
-Name: NetworkManager-vpnc
-Version: 0.7.0
-Release: 0%{?nm_vpnc_cvs_version}.4%{?dist}
-License: GPL
-Group: System Environment/Base
-Source: %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
+Summary:   NetworkManager VPN integration for vpnc
+Name:      NetworkManager-vpnc
+Version:   0.7.0
+Release:   0%{?nm_vpnc_cvs_version}.1%{?dist}
+License:   GPL
+Group:     System Environment/Base
+URL:       http://www.gnome.org/projects/NetworkManager/
+Source:    %{name}-%{version}%{?nm_vpnc_cvs_version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
 BuildRequires: gtk2-devel             >= %{gtk2_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
 BuildRequires: NetworkManager-devel   >= %{nm_version}
@@ -26,18 +28,18 @@
 BuildRequires: gnome-keyring-devel
 BuildRequires: libglade2-devel
 BuildRequires: libpng-devel
-BuildRequires: perl(XML::Parser) gettext
-PreReq: /usr/bin/update-desktop-database
-PreReq: /usr/bin/gtk-update-icon-cache
+BuildRequires: intltool gettext
+
 Requires: gtk2             >= %{gtk2_version}
 Requires: dbus             >= %{dbus_version}
 Requires: NetworkManager   >= %{nm_version}
 Requires: vpnc             >= %{vpnc_version}
 Requires: shared-mime-info >= %{shared_mime_version}
 Requires: GConf2
-Requires: libgnomeui
 Requires: gnome-keyring
-Requires: libglade2
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 
 %description
 This package contains software for integrating the vpnc VPN software
@@ -48,19 +50,22 @@
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
+rm -f %{buildroot}%{_libdir}/lib*.so
 
 %find_lang %{name}
 
+
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
 
 %post
 /sbin/ldconfig
@@ -69,6 +74,7 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
+
 %postun
 /sbin/ldconfig
 /usr/bin/update-desktop-database > /dev/null
@@ -76,14 +82,15 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
+
 %files -f %{name}.lang
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS ChangeLog
 %{_libdir}/lib*.so*
 %{_libexecdir}/nm-vpnc-auth-dialog
-%{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
-%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
+%config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
 %{_bindir}/nm-vpnc-service
 %{_bindir}/nm-vpnc-service-vpnc-helper
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
@@ -91,7 +98,11 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
-* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.4%{?dist}
+* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060929.1
+- Update to CVS snapshot 060929
+- Some rpmlint cleanups
+
+* Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.4
 - Added XML::Parser BR
 
 * Fri Sep 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.0-0.cvs20060529.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 May 2006 05:12:51 -0000	1.8
+++ sources	2 Oct 2006 23:13:54 -0000	1.9
@@ -1 +1 @@
-e49518b7932079ceaf4b358d6b0a727e  NetworkManager-vpnc-0.7.0.cvs20060529.tar.gz
+882293dbed2f8af9c0cd61bc65fdaa3f  NetworkManager-vpnc-0.7.0.cvs20060929.tar.gz