rpms/knetworkmanager/devel knetworkmanager-kpp.patch, NONE, 1.1 knetworkmanager-svn_checkout.sh, 1.1, 1.2 knetworkmanager.spec, 1.5, 1.6 knetworkmanager-dbus.patch, 1.2, NONE

[Dennis Gilmore (ausil)]

Author: ausil

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

Modified Files:
	knetworkmanager-svn_checkout.sh knetworkmanager.spec 
Added Files:
	knetworkmanager-kpp.patch 
Removed Files:
	knetworkmanager-dbus.patch 
Log Message:
rebuild against dbus-qt


knetworkmanager-kpp.patch:

--- NEW FILE knetworkmanager-kpp.patch ---
--- knetworkmanager-orig/knetworkmanager/configure.in.in	2007-01-23 07:56:04.000000000 -0600
+++ knetworkmanager/knetworkmanager/configure.in.in	2007-01-27 00:16:57.000000000 -0600
@@ -48,9 +48,10 @@
 AC_LANG_RESTORE
 
 
-AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse]))
+AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: suse, fedora]))
 if test "x$with_distro" = "x"; then
 	AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
+	AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
 	if test "x$with_distro" = "x"; then
 		with_distro=`lsb_release -is`
 	fi
@@ -65,6 +66,9 @@
 		suse)
 			AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /sbin/yast2 modem", [Command to launch dial up configuration tool])
 			;;
+                fedora)
+			AC_DEFINE_UNQUOTED(KNETWORKMANAGER_DIALUP_CONFIG, "kdesu --nonewdcop /usr/bin/kppp", [Command to launch dial up configuration tool])
+			;; 
 		*)
 			echo "Your distribution (${with_distro}) is not yet supported (e.g. you will not be able to launch a tool to configure dial-up connections.)"
 			;;


Index: knetworkmanager-svn_checkout.sh
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager-svn_checkout.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- knetworkmanager-svn_checkout.sh	26 Jun 2006 17:30:11 -0000	1.1
+++ knetworkmanager-svn_checkout.sh	2 Feb 2007 14:35:40 -0000	1.2
@@ -4,17 +4,18 @@
 EXPORT_DIR=knetworkmanager
 
 set -x
-rm -rf $EXPORT_DIR 
+rm -rf $EXPORT_DIR
 svn --non-recursive export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/ $EXPORT_DIR
 # app
-svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/knetworkmanager/ $EXPORT_DIR/knetworkmanager
+#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
 # docs
 #svn export  svn://anonsvn.kde.org/home/kde/trunk/kdereview/doc/knetworkmanager $EXPORT_DIR/doc/
 # auto*/configure bits
 svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin $EXPORT_DIR/admin/
 
-tar cjf knetworkmanager-svn${DATE}.tar.bz2 $EXPORT_DIR 
+tar cjf knetworkmanager-svn${DATE}.tar.bz2 $EXPORT_DIR
 
 # cleanup
-rm -rf $EXPORT_DIR 
+rm -rf $EXPORT_DIR
 


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/knetworkmanager.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- knetworkmanager.spec	14 Nov 2006 13:08:52 -0000	1.5
+++ knetworkmanager.spec	2 Feb 2007 14:35:40 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           knetworkmanager
 Version:        0.1
-Release:        0.5.%{svn}%{?dist}
+Release:        0.6.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -11,13 +11,14 @@
 Source0:        knetworkmanager-%{svn}.tar.bz2
 #script to make svn tarball
 Source1:	knetworkmanager-svn_checkout.sh
-# Patch adds dbus support  as dbusqt3 is no longer in extras
-Patch0:		knetworkmanager-dbus.patch
+# Patch adds kpp dialup support 
+Patch0:		knetworkmanager-kpp.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  NetworkManager-devel >= 0.6.2 dbus-devel autoconf automake
 BuildRequires:  desktop-file-utils kdebase-devel hal-devel wireless-tools-devel
+BuildRequires:  dbus-qt-devel
 
 %description
 KNetworkManager is a system tray applet for controlling network
@@ -25,11 +26,9 @@
 
 %prep
 %setup -q -n knetworkmanager
-%patch0 -p1 -b .dbus
+%patch0 -p1 -b .kppp
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 make -f Makefile.cvs
 %configure --disable-rpath
 make %{?_smp_mflags}
@@ -84,6 +83,9 @@
 
 
 %changelog
+* Fri Jan 26 2007 Dennis Gilmore <dennis at ausil.us> - 0.1-0.6.svn20061113
+- build against dbus-qt package
+
 * Tue Nov 14 2006 Dennis Gilmore <dennis at ausil.us> - 0.1-0.5.svn20061113
 - messed up check in :(
 


--- knetworkmanager-dbus.patch DELETED ---