rpms/knetworkmanager/devel 01-build-fix.patch, NONE, 1.1 knetworkmanager-call-scn-not-yast.patch, NONE, 1.1 knetworkmanager-svn_checkout.sh, NONE, 1.1 knetworkmanager.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Mon Jun 26 17:30:11 UTC 2006
Author: ausil
Update of /cvs/extras/rpms/knetworkmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18898/devel
Modified Files:
.cvsignore sources
Added Files:
01-build-fix.patch knetworkmanager-call-scn-not-yast.patch
knetworkmanager-svn_checkout.sh knetworkmanager.spec
Log Message:
auto-import knetworkmanager-0.1-0.3.svn20060625 on branch devel from knetworkmanager-0.1-0.3.svn20060625.src.rpm
01-build-fix.patch:
--- NEW FILE 01-build-fix.patch ---
diff -urN knetworkmanager-orig/src/Makefile.am knetworkmanager/src/Makefile.am
--- knetworkmanager-orig/src/Makefile.am 2006-05-22 17:53:17.000000000 +0600
+++ knetworkmanager/src/Makefile.am 2006-05-24 22:05:11.000000000 +0600
@@ -8,7 +8,7 @@
knetworkmanager-nminfo_dbus.h knetworkmanager-nminfo.h knetworkmanager-notify.h \
knetworkmanager-tray.h knetworkmanager-state.h knetworkmanager-state_dbus.h \
knetworkmanager-storage.h knetworkmanager-encryption.h knetworkmanager-ui-networklistview.h \
- knetworkmanager-vpn.h knetworkmanager-vpn_dbus.h
+ knetworkmanager-vpn.h knetworkmanager-vpn_dbus.h networkstatuscommon.h
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
@@ -36,16 +36,14 @@
knetworkmanager-dialup.cpp settings.kcfgc knetworkmanager-encryption.cpp knetworkmanager-tray.cpp \
activation.ui cryptowidget.ui networkchoicewidget.ui networklabelwidget.ui \
knetworkmanager-ui-networklistview.cpp \
- knetworkmanager-vpn.cpp knetworkmanager-vpn_dbus.cpp serviceiface.stub
-
-serviceiface_DIR = /opt/kde3/include
+ knetworkmanager-vpn.cpp knetworkmanager-vpn_dbus.cpp serviceiface.stub networkstatuscommon.cpp
kde_kcfg_DATA = knetworkmanager.kcfg
knetworkmanager_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) \
$(KDE_PLUGIN)
-knetworkmanager_la_LIBADD = -lnetworkstatus -ldbus-qt-1 $(PACKAGE_LIBS) \
+knetworkmanager_la_LIBADD = -ldbus-qt-1 $(PACKAGE_LIBS) \
$(LIB_KDEUI) -lkwalletclient -lkdeui -lkio
# this is where the desktop file will go
diff -urN knetworkmanager-orig/src/networkstatuscommon.cpp knetworkmanager/src/networkstatuscommon.cpp
--- knetworkmanager-orig/src/networkstatuscommon.cpp 1970-01-01 05:00:00.000000000 +0500
+++ knetworkmanager/src/networkstatuscommon.cpp 2005-09-10 14:24:02.000000000 +0600
@@ -0,0 +1,53 @@
+/*
+ This file is part of kdepim.
+
+ Copyright (c) 2005 Will Stephenson <lists at stevello.free-online.co.uk>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "networkstatuscommon.h"
+#include <kdebug.h>
+
+QDataStream & operator<< ( QDataStream & s, const NetworkStatus::Properties p )
+{
+ kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl;
+ s << (int)p.status;
+ s << (int)p.onDemandPolicy;
+ s << p.service;
+ s << ( p.internet ? 1 : 0 );
+ s << p.netmasks;
+ return s;
+}
+
+QDataStream & operator>> ( QDataStream & s, NetworkStatus::Properties &p )
+{
+ int status, onDemandPolicy, internet;
+ s >> status;
+ kdDebug() << k_funcinfo << "status is: " << status << endl;
+ p.status = ( NetworkStatus::EnumStatus )status;
+ s >> onDemandPolicy;
+ p.onDemandPolicy = ( NetworkStatus::EnumOnDemandPolicy )onDemandPolicy;
+ s >> p.service;
+ s >> internet;
+ if ( internet )
+ p.internet = true;
+ else
+ p.internet = false;
+ s >> p.netmasks;
+ kdDebug() << k_funcinfo << "enum converted status is: " << p.status << endl;
+ return s;
+}
diff -urN knetworkmanager-orig/src/networkstatuscommon.h knetworkmanager/src/networkstatuscommon.h
--- knetworkmanager-orig/src/networkstatuscommon.h 1970-01-01 05:00:00.000000000 +0500
+++ knetworkmanager/src/networkstatuscommon.h 2005-09-10 14:24:02.000000000 +0600
@@ -0,0 +1,54 @@
+/*
+ This file is part of kdepim.
+
+ Copyright (c) 2005 Will Stephenson <lists at stevello.free-online.co.uk>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef NETWORKSTATUS_COMMON_H
+#define NETWORKSTATUS_COMMON_H
+
+#include <qstringlist.h>
+
+namespace NetworkStatus
+{
+ enum EnumStatus { NoNetworks = 1, Unreachable, OfflineDisconnected, OfflineFailed, ShuttingDown, Offline, Establishing, Online };
+ enum EnumRequestResult { RequestAccepted = 1, Connected, UserRefused, Unavailable };
+ enum EnumOnDemandPolicy { All, User, None, Permanent };
+ struct Properties
+ {
+ QString name;
+ // status of the network
+ EnumStatus status;
+ // policy for on-demand usage as defined by the service
+ EnumOnDemandPolicy onDemandPolicy;
+ // identifier for the service
+ QCString service;
+ // indicate that the connection is to 'the internet' - similar to default gateway in routing
+ bool internet;
+ // list of netmasks that the network connects to - overridden by above internet
+ QStringList netmasks;
+ // for future expansion consider
+ // EnumChargingModel - FlatRate, TimeCharge, VolumeCharged
+ // EnumLinkStatus - for WLANs - VPOOR, POOR, AVERAGE, GOOD, EXCELLENT
+ };
+}
+
+QDataStream & operator>> ( QDataStream & s, NetworkStatus::Properties &p );
+QDataStream & operator<< ( QDataStream & s, const NetworkStatus::Properties p );
+
+#endif
diff -urN knetworkmanager-orig/src/serviceiface.h knetworkmanager/src/serviceiface.h
--- knetworkmanager-orig/src/serviceiface.h 1970-01-01 05:00:00.000000000 +0500
+++ knetworkmanager/src/serviceiface.h 2005-09-10 14:24:02.000000000 +0600
@@ -0,0 +1,51 @@
+/*
+ This file is part of kdepim.
+
+ Copyright (c) 2005 Will Stephenson <lists at stevello.free-online.co.uk>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KDED_NETWORKSTATUS_SERVICEIFACE_H
+#define KDED_NETWORKSTATUS_SERVICEIFACE_H
+
+#include "networkstatuscommon.h"
+
+#include <dcopobject.h>
+
+class ServiceIface : virtual public DCOPObject
+{
+K_DCOP
+k_dcop:
+ /** Change the status for the given network */
+ virtual void setNetworkStatus( const QString & networkName, int status ) = 0;
+ /** Register or update the properties for a network
+ NB Check that people don't use this to change status */
+ virtual void registerNetwork( const QString & networkName, NetworkStatus::Properties properties ) = 0;
+ /**
+ * Indicate that this service is no longer administering the named network
+ * TODO: Work out the implications to clients of unregistering a network
+ * - maybe this method needs more parameters to give them a clue.
+ */
+ virtual void unregisterNetwork( const QString & networkName ) = 0;
+ /**
+ * Tell the daemon that the service would like to shut down this network connection,
+ * and to notify clients using it so they can stop using it in a controlled manner
+ */
+ virtual void requestShutdown( const QString & networkName ) = 0;
+};
+
+#endif
knetworkmanager-call-scn-not-yast.patch:
--- NEW FILE knetworkmanager-call-scn-not-yast.patch ---
--- knetworkmanager-orig/knetworkmanager/src/knetworkmanager-tray.cpp 2006-06-26 04:58:01.000000000 -0500
+++ knetworkmanager/knetworkmanager/src/knetworkmanager-tray.cpp 2006-06-26 04:59:06.000000000 -0500
@@ -235,7 +235,7 @@
{
KProcess* yast2 = new KProcess ();
- *yast2 << "kdesu" << "--nonewdcop" << "/sbin/yast2" << "modem";
+ *yast2 << "/usr/bin/system-config-network";
yast2->start ();
}
--- NEW FILE knetworkmanager-svn_checkout.sh ---
#/bin/sh
DATE=$(date +%Y%m%d)
EXPORT_DIR=knetworkmanager
set -x
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
# 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
# cleanup
rm -rf $EXPORT_DIR
--- NEW FILE knetworkmanager.spec ---
%define svn svn20060625
Name: knetworkmanager
Version: 0.1
Release: 0.3.%{svn}%{?dist}
Summary: KDE applet for Network Manager
Group: Applications/Internet
License: GPL
URL: http://en.opensuse.org/Projects/KNetworkManager
Source0: knetworkmanager-%{svn}.tar.bz2
#script to make svn tarball
Source1: knetworkmanager-svn_checkout.sh
# Patch Is required because SuSE have a broken kdepim-devel that exports non standard headers
# they also hard code the /opt/kde3/include path in there. the patch adds the needed header
# file and fixes the path
Patch0: http://aur.archlinux.org/packages/knetworkmanager-svn/knetworkmanager-svn/01-build-fix.patch
# Suse Hard coded yast for dialup configuration. this patch calls System-config-network instead
Patch1: knetworkmanager-call-scn-not-yast.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: NetworkManager-devel >= 0.6.2 dbus-qt-devel autoconf automake
BuildRequires: desktop-file-utils kdebase-devel hal-devel
%description
KNetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
%prep
%setup -q -n knetworkmanager
%patch0 -p0
%patch1 -p1 -b .eww-yast
%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}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--vendor=fedora \
--add-category=X-Fedora \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/knetworkmanager.desktop
## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
lang=$(basename $lang_dir)
echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang
done
fi
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/crystalsvg || :
%postun
touch --no-create %{_datadir}/icons/crystalsvg || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc knetworkmanager/COPYING knetworkmanager/AUTHORS knetworkmanager/README knetworkmanager/TODO knetworkmanager/NEWS
%config(noreplace) /etc/dbus-1/system.d/knetworkmanager.conf
%{_bindir}/knetworkmanager
%{_libdir}/kde3/knetworkmanager.*
%{_libdir}/libkdeinit_knetworkmanager.*
%{_datadir}/icons/crystalsvg/*/apps/knetworkmanager.png
%{_datadir}/apps/knetworkmanager
%{_datadir}/config.kcfg/knetworkmanager.kcfg
%{_datadir}/applications/fedora-knetworkmanager.desktop
%changelog
* Mon Jun 27 2006 <dennis at ausil.us> - 0.1-0.3.svn20060626
- patch out call to yast and replace with
- system-config-network for dialup
* Mon Jun 27 2006 <dennis at ausil.us> - 0.1-0.2.svn20060626
- add a . to the release
* Mon Jun 27 2006 <dennis at ausil.us> - 0.1-0.1svn20060626
- fix BuildRequires missing hal-devel, fix version to match
- fedora guidelines, add comment about patch Bad SuSE
* Mon May 29 2006 <dennis at ausil.us> - 0.1-1svn20060626
- update to different svn branch
* Wed Mar 13 2006 <dennis at ausil.us> - 0.1r5872-1
- Initial Fedora Port
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 26 Jun 2006 17:09:42 -0000 1.1
+++ .cvsignore 26 Jun 2006 17:30:11 -0000 1.2
@@ -0,0 +1 @@
+knetworkmanager-svn20060625.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/knetworkmanager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 26 Jun 2006 17:09:42 -0000 1.1
+++ sources 26 Jun 2006 17:30:11 -0000 1.2
@@ -0,0 +1 @@
+9576bce2cd34350d257e94a8b31efa86 knetworkmanager-svn20060625.tar.bz2
More information about the scm-commits
mailing list