rpms/knetworkmanager/devel .cvsignore, 1.10, 1.11 knetworkmanager-svn_checkout.sh, 1.5, 1.6 knetworkmanager.spec, 1.14, 1.15 sources, 1.10, 1.11

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore knetworkmanager-svn_checkout.sh 
	knetworkmanager.spec sources 
Log Message:
* Sat Jan 19 2008 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.7-0.1.svn20080119
- first try using knetworkmanager-0.7 branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	21 Sep 2007 16:48:31 -0000	1.10
+++ .cvsignore	22 Jan 2008 21:43:49 -0000	1.11
@@ -1,2 +1 @@
-knetworkmanager-svn20070815.tar.bz2
-knetworkmanager-svn20070921.tar.bz2
+knetworkmanager-svn20080119.tar.bz2


Index: knetworkmanager-svn_checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager-svn_checkout.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- knetworkmanager-svn_checkout.sh	8 Jan 2008 18:33:48 -0000	1.5
+++ knetworkmanager-svn_checkout.sh	22 Jan 2008 21:43:49 -0000	1.6
@@ -7,9 +7,9 @@
 rm -rf $EXPORT_DIR
 svn --non-recursive export  svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network $EXPORT_DIR
 # app
-#svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/knetworkmanager/ $EXPORT_DIR/knetworkmanager
-#svn export  svn://websvn.kde.org/home/kde/trunk/extragear/network/knetworkmanager $EXPORT_DIR/knetworkmanager
-svn export  svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager/ $EXPORT_DIR/knetworkmanager
+#svn export  svn://anonsvn.kde.org/home/kde/branches/extragear/kde3/network/knetworkmanager/ $EXPORT_DIR/knetworkmanager
+svn export svn://anonsvn.kde.org/home/kde/branches/work/knetworkmanager/knetworkmanager-0.7 $EXPORT_DIR/knetworkmanager
+
 # docs
 #svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/doc/knetworkmanager $EXPORT_DIR/doc/
 # auto*/configure bits


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- knetworkmanager.spec	14 Dec 2007 20:37:14 -0000	1.14
+++ knetworkmanager.spec	22 Jan 2008 21:43:49 -0000	1.15
@@ -1,8 +1,8 @@
-%define         svn svn20070921
+%define         svn svn20080119
 
 Name:           knetworkmanager
-Version:        0.2
-Release:        0.3.%{svn}%{?dist}
+Version:        0.7
+Release:        0.1.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -15,9 +15,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake
-BuildRequires:  NetworkManager-devel >= 0.6.2
+BuildRequires:  NetworkManager-devel >= 0.7
 BuildRequires:  desktop-file-utils kdelibs3-devel hal-devel wireless-tools-devel
-BuildRequires:  dbus-qt-devel libnl-devel
+BuildRequires:  dbus-qt3-devel libnl-devel
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -64,6 +64,7 @@
 
 make -f Makefile.cvs
 
+
 %build
 %configure --disable-rpath --with-openvpn --with-vpnc --with-pptp \
            --disable-warnings 
@@ -75,16 +76,17 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
---dir $RPM_BUILD_ROOT%{_datadir}/applications \
---vendor=fedora \
+--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+--vendor="" \
 --remove-category=Applet \
 --remove-category=Network \
 --add-category=System \
 --delete-original \
 $RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/autostart/
-cp $RPM_BUILD_ROOT%{_datadir}/applications/fedora-knetworkmanager.desktop $RPM_BUILD_ROOT%{_datadir}/autostart/knetworkmanager-autostart.desktop
+install -p -m644 -D \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop \
+  $RPM_BUILD_ROOT%{_datadir}/autostart/knetworkmanager-autostart.desktop
 
 ## File lists
 # locale's
@@ -114,11 +116,11 @@
 %{_bindir}/knetworkmanager
 %{_libdir}/kde3/knetworkmanager.*
 %{_libdir}/libkdeinit_knetworkmanager.*
-%{_datadir}/icons/crystalsvg/*/apps/knetworkmanager.png
-%{_datadir}/apps/knetworkmanager
+%{_datadir}/icons/crystalsvg/*/*/*
+%{_datadir}/apps/knetworkmanager/
 %{_datadir}/autostart/knetworkmanager-autostart.desktop
 %{_datadir}/config.kcfg/knetworkmanager.kcfg
-%{_datadir}/applications/fedora-knetworkmanager.desktop
+%{_datadir}/applications/kde/knetworkmanager.desktop
 %{_datadir}/servicetypes/knetworkmanager_plugin.desktop
 %{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
 
@@ -153,6 +155,9 @@
 
 
 %changelog
+* Sat Jan 19 2008 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.7-0.1.svn20080119
+- first try using knetworkmanager-0.7 branch
+
 * Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.2-0.3.svn20070921
 - BR: kdelibs3-devel
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Sep 2007 16:48:31 -0000	1.10
+++ sources	22 Jan 2008 21:43:49 -0000	1.11
@@ -1 +1 @@
-6ed8a71d34c2046b75d3f94176a6bf3d  knetworkmanager-svn20070921.tar.bz2
+3c3ddab8b9508b3045dc041d807ca5cd  knetworkmanager-svn20080119.tar.bz2