rpms/knetworkmanager/devel .cvsignore, 1.13, 1.14 knetworkmanager.spec, 1.21, 1.22 sources, 1.13, 1.14

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	.cvsignore knetworkmanager.spec sources 
Log Message:
update to new svn snapshot, reenable subpackages



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Jun 2008 17:08:12 -0000	1.13
+++ .cvsignore	15 Jul 2008 18:32:38 -0000	1.14
@@ -1 +1 @@
-knetworkmanager-0.7-20080603svn.tar.bz2
+knetworkmanager-0.7-20080715svn.tar.bz2


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- knetworkmanager.spec	3 Jun 2008 17:59:48 -0000	1.21
+++ knetworkmanager.spec	15 Jul 2008 18:32:38 -0000	1.22
@@ -1,8 +1,8 @@
-%define         svn 20080603svn
+%define         svn 20080715svn
 
 Name:           knetworkmanager
 Version:        0.7
-Release:        0.4.%{svn}%{?dist}
+Release:        0.5.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -13,7 +13,6 @@
 Source1:	knetworkmanager-svn_checkout.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: knetworkmanager-0.7-pptp.patch
 
 BuildRequires:  automake libtool 
 BuildRequires:  dbus-qt3-devel >= 0.8.1
@@ -25,12 +24,6 @@
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
 
-# upgrade path, until otherwise sorted out -- Rex
-Obsoletes: %{name}-openvpn < %{version}-%{release}
-Obsoletes: %{name}-vpnc < %{version}-%{release}
-Obsoletes: %{name}-pptp < %{version}-%{release}
-Obsoletes: %{name}-devel < %{version}-%{release}
-
 %package openvpn
 Summary:        knetworkmanager openvpn client
 Group:          Applications/Internet
@@ -66,7 +59,6 @@
 %prep 
 %setup -q -n %{name}-%{version}
 
-%patch1 -p1 -b .pptp
 
 make -f admin/Makefile.common 
 
@@ -74,7 +66,10 @@
 %build
 %configure \
   --disable-rpath \
-  --disable-warnings
+  --disable-warnings \
+  --with-openvpn \
+  --with-vpnc \
+  --with-pptp
 
 # not smp safe
 make
@@ -111,11 +106,6 @@
 mv %{buildroot}%{_datadir}/icons/crystalsvg \
    %{buildroot}%{_datadir}/icons/hicolor
 
-## unpackaged files
-# omit these for now, don't feel like re-instating a -devel pkg 
-# and dealing with multilib -- Rex
-rm -rf %{buildroot}%{_includedir}
-
 
 %clean
 rm -rf %{buildroot}
@@ -144,29 +134,29 @@
 %{_datadir}/servicetypes/knetworkmanager_plugin.desktop
 %{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
 
-#%files devel
-#%defattr(-,root,root,-)
-#%{_includedir}/knetworkmanager-plugin.h
-#%{_includedir}/knetworkmanager-vpnplugin.h
-
-#%files openvpn
-#%defattr(-,root,root,-)
-#%{_libdir}/kde3/knetworkmanager_openvpn.la
-#%{_libdir}/kde3/knetworkmanager_openvpn.so
-#%{_libdir}/kde3/knetworkmanager_openvpn.so.0
-#%{_libdir}/kde3/knetworkmanager_openvpn.so.0.0.0
-#%{_datadir}/services/knetworkmanager_openvpn.desktop
-
-#%files vpnc
-#%defattr(-,root,root,-)
-#%{_libdir}/kde3/knetworkmanager_vpnc.la
-#%{_libdir}/kde3/knetworkmanager_vpnc.so
-#%{_libdir}/kde3/knetworkmanager_vpnc.so.0
-#%{_libdir}/kde3/knetworkmanager_vpnc.so.0.0.0
-#%{_datadir}/services/knetworkmanager_vpnc.desktop
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/knetworkmanager-plugin.h
+%{_includedir}/knetworkmanager-vpnplugin.h
+
+%files openvpn
+%defattr(-,root,root,-)
+%{_libdir}/kde3/knetworkmanager_openvpn.la
+%{_libdir}/kde3/knetworkmanager_openvpn.so
+%{_libdir}/kde3/knetworkmanager_openvpn.so.0
+%{_libdir}/kde3/knetworkmanager_openvpn.so.0.0.0
+%{_datadir}/services/knetworkmanager_openvpn.desktop
 
-#%files pptp
-#%defattr(-,root,root,-)
+%files vpnc
+%defattr(-,root,root,-)
+%{_libdir}/kde3/knetworkmanager_vpnc.la
+%{_libdir}/kde3/knetworkmanager_vpnc.so
+%{_libdir}/kde3/knetworkmanager_vpnc.so.0
+%{_libdir}/kde3/knetworkmanager_vpnc.so.0.0.0
+%{_datadir}/services/knetworkmanager_vpnc.desktop
+
+%files pptp
+%defattr(-,root,root,-)
 #%{_libdir}/kde3/knetworkmanager_pptp.la
 #%{_libdir}/kde3/knetworkmanager_pptp.so
 #%{_libdir}/kde3/knetworkmanager_pptp.so.0
@@ -175,6 +165,11 @@
 
 
 %changelog
+* Tue Jul 15 2008 Dennis Gilmore <dennis at ausil.us> - 0.7-0.5.20080715svn
+- update to latest snapshot
+- renable all sub-packages
+- pptp is still not upstream  but we will create a blank rpm for now.
+
 * Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7-0.4.20080603svn
 - 20080603 snapshot
 - Obsoletes for subpkgs not included


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Jun 2008 17:08:12 -0000	1.13
+++ sources	15 Jul 2008 18:32:38 -0000	1.14
@@ -1 +1 @@
-003a4d5b67a613b43482b2d3e1e0d2a5  knetworkmanager-0.7-20080603svn.tar.bz2
+6fd9dcad8e3d0ac07fe3e0c6f662fdee  knetworkmanager-0.7-20080715svn.tar.bz2