Hello community,
here is the log from the commit of package NetworkManager-kde4 for openSUSE:Factory
checked in at Mon May 30 15:50:58 CEST 2011.
--------
--- KDE/NetworkManager-kde4/NetworkManager-kde4.changes 2011-02-05 16:53:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/NetworkManager-kde4/NetworkManager-kde4.changes 2011-05-04 11:31:09.000000000 +0200
@@ -1,0 +2,8 @@
+Wed May 4 09:08:32 UTC 2011 - tittiatcoke@gmail.com
+
+- Update to git snapshot 20110503
+- Remove 2 obsolete patches
+- Added compatibility patch for NM 0.9 (Only for Factory)
+- Monolithic KNM is no longer build
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
fix-bssid-bko238046.diff
no_dbusmenu.diff
New:
----
build-fix.diff
kde-plasma-networkmanagement-nm-compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde4.spec ++++++
--- /var/tmp/diff_new_pack.pXL42W/_old 2011-05-30 15:49:50.000000000 +0200
+++ /var/tmp/diff_new_pack.pXL42W/_new 2011-05-30 15:49:50.000000000 +0200
@@ -19,9 +19,14 @@
Url: http://www.kde.org
Name: NetworkManager-kde4
-BuildRequires: NetworkManager-devel kdebase4-workspace-devel
-Version: 0.9.svn1192577
-Release: 3
+BuildRequires: kdebase4-workspace-devel
+%if %suse_version > 1140
+BuildRequires: NetworkManager-devel > 0.8.997
+%else
+BuildRequires: NetworkManager-devel < 0.8.5
+%endif
+Version: 0.9.1git20110503
+Release: 1
License: LGPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/GUI/KDE
@@ -29,19 +34,23 @@
Source0: networkmanagement.tar.bz2
Source1: networkmanager-po.tar.bz2
Source2: knetworkmanager.default.sh
-Patch1: no_dbusmenu.diff
+Patch1: build-fix.diff
Patch9: code11_networkmanager_no_neverdefault.diff
-Patch10: fix-bssid-bko238046.diff
+%if %suse_version > 1140
+Patch99: kde-plasma-networkmanagement-nm-compat.patch
+%endif
Recommends: %{name}-libs-lang = %{version}
Requires: %{name}-libs = %{version}-%{release}
Provides: NetworkManager-client
ExcludeArch: s390 s390x
# currently not our default
+%if 0
%if %suse_version > 1110
Supplements: packageand(NetworkManager:kdebase4-session)
%endif
Obsoletes: NetworkManager-kde <= 0.7r848570
Conflicts: plasmoid-networkmanagement
+%endif
%kde4_runtime_requires
%description
@@ -131,17 +140,19 @@
%lang_package -n %name-libs
%prep
%setup -q -n networkmanagement -a 1
-%patch1 -p1
+%patch1 -p0
%if %suse_version < 1120
%patch9
%endif
-%patch10
+%if %suse_version > 1140
+%patch99 -p1
+%endif
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
echo "add_subdirectory(po)" >> CMakeLists.txt
%build
- %cmake_kde4 -d build \-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d \-DINSTALL_KNM_AUTOSTART=ON
+ %cmake_kde4 -d build \-DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
%make_jobs
%install
@@ -194,16 +205,20 @@
%_kde4_iconsdir/oxygen/48x48/devices/
%_kde4_iconsdir/oxygen/64x64/devices/
%_kde4_iconsdir/oxygen/128x128/devices/
-%_kde4_iconsdir/hicolor/32x32/apps/knetworkmanager.png
%_kde4_modulesdir/libexec/networkmanagement_configshell
+%_kde4_sharedir/env
%files -n plasmoid-networkmanagement
%defattr(-,root,root)
%_kde4_servicesdir/plasma-applet-networkmanagement.desktop
+%_kde4_servicesdir/plasma-engine-networkmanagement.desktop
%_kde4_modulesdir/plasma_applet_networkmanagement.so
+%_kde4_modulesdir/plasma_engine_networkmanagement.so
%_kde4_modulesdir/kded_networkmanagement.so
%_kde4_servicesdir/kded
+%if 0
+
%files
%defattr(-,root,root)
%{_bindir}/knetworkmanager
@@ -214,6 +229,7 @@
%if %suse_version <= 1120
%config /etc/dbus-1/system.d/NetworkManager-kde4.conf
%endif
+%endif
%files -n NetworkManager-openvpn-kde4
%defattr(-,root,root)
++++++ build-fix.diff ++++++
--- libs/ui/ipv6advancedwidget.h 2011-05-04 21:43:40.491004855 +0200
+++ libs/ui/ipv6advancedwidget.h 2011-05-04 22:17:33.489005793 +0200
@@ -26,6 +26,9 @@
#include <QStyledItemDelegate>
#include "networkipv6config.h"
+
+class QStandardItem;
+class QItemSelection;
class IpV6AdvancedWidget : public QWidget
{
++++++ kde-plasma-networkmanagement-nm-compat.patch ++++++
diff -ur networkmanagement-orig/backends/NetworkManager/busconnection.h networkmanagement-0.9/backends/NetworkManager/busconnection.h
--- networkmanagement-orig/backends/NetworkManager/busconnection.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/busconnection.h 2011-04-20 14:53:34.895397075 +0200
@@ -51,9 +51,9 @@
class BusConnection : public QObject
{
Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings.Connection")
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings.Connection")
// Can QtDbus handle multiple interfaces being provided by one object like this?
- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings.Connection.Secrets")
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings.Connection.Secrets")
public:
/**
diff -ur networkmanagement-orig/backends/NetworkManager/exportedconnection.h networkmanagement-0.9/backends/NetworkManager/exportedconnection.h
--- networkmanagement-orig/backends/NetworkManager/exportedconnection.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/exportedconnection.h 2011-04-20 14:53:34.895397075 +0200
@@ -30,9 +30,9 @@
class ConnectionAdaptor: public QDBusAbstractAdaptor
{
Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings.Connection")
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings.Connection")
Q_CLASSINFO("D-Bus Introspection", ""
-" \n"
+" \n"
" \n"
" \n"
" \n"
diff -ur networkmanagement-orig/backends/NetworkManager/exportedconnectionsecrets.h networkmanagement-0.9/backends/NetworkManager/exportedconnectionsecrets.h
--- networkmanagement-orig/backends/NetworkManager/exportedconnectionsecrets.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/exportedconnectionsecrets.h 2011-04-20 14:53:34.895397075 +0200
@@ -30,9 +30,9 @@
class SecretsAdaptor: public QDBusAbstractAdaptor
{
Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings.Connection.Secrets")
+ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings.Connection.Secrets")
Q_CLASSINFO("D-Bus Introspection", ""
-" \n"
+" \n"
" \n"
" \n"
" \n"
diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-active-connection.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-active-connection.xml
--- networkmanagement-orig/backends/NetworkManager/introspection/nm-active-connection.xml 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-active-connection.xml 2011-04-20 14:53:34.895397075 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <interface name="org.freedesktop.NetworkManager.Connection.Active">
+ <interface name="org.freedesktop.NetworkManagerCompat.Connection.Active">
<property name="ServiceName" type="s" access="read">
tp:docstringThe D-Bus service name providing this connection.
</property>
diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-connection-secrets.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-connection-secrets.xml
--- networkmanagement-orig/backends/NetworkManager/introspection/nm-connection-secrets.xml 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-connection-secrets.xml 2011-04-20 14:53:34.895397075 +0200
@@ -2,7 +2,7 @@
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <interface name="org.freedesktop.NetworkManagerSettings.Connection.Secrets">
+ <interface name="org.freedesktop.NetworkManager.Settings.Connection.Secrets">
tp:docstring
Secrets have a separate interface so that they can be locked down.
diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-exported-connection.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-exported-connection.xml
--- networkmanagement-orig/backends/NetworkManager/introspection/nm-exported-connection.xml 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-exported-connection.xml 2011-04-20 14:53:34.895397075 +0200
@@ -2,7 +2,7 @@
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <interface name="org.freedesktop.NetworkManagerSettings.Connection">
+ <interface name="org.freedesktop.NetworkManager.Settings.Connection">
tp:docstring
Represents a single network connection configuration.
diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-settings.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-settings.xml
--- networkmanagement-orig/backends/NetworkManager/introspection/nm-settings.xml 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-settings.xml 2011-04-20 14:53:34.896397057 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <interface name="org.freedesktop.NetworkManagerSettings">
+ <interface name="org.freedesktop.NetworkManager.Settings">
tp:docstring
The NetworkManagerSettings interface is provided by the service which provides connections to NetworkManager.
diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-vpn-connection.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-vpn-connection.xml
--- networkmanagement-orig/backends/NetworkManager/introspection/nm-vpn-connection.xml 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-vpn-connection.xml 2011-04-20 14:53:34.896397057 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <interface name="org.freedesktop.NetworkManager.VPN.Connection">
+ <interface name="org.freedesktop.NetworkManagerCompat.VPN.Connection">
tp:docstring
Represents an active connection to a Virtual Private Network.
diff -ur networkmanagement-orig/backends/NetworkManager/nm-active-connectioninterface.h networkmanagement-0.9/backends/NetworkManager/nm-active-connectioninterface.h
--- networkmanagement-orig/backends/NetworkManager/nm-active-connectioninterface.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/nm-active-connectioninterface.h 2011-04-20 16:49:16.302308474 +0200
@@ -29,7 +29,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
- { return "org.freedesktop.NetworkManager.Connection.Active"; }
+ { return "org.freedesktop.NetworkManagerCompat.Connection.Active"; }
public:
OrgFreedesktopNetworkManagerConnectionActiveInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
diff -ur networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.cpp networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.cpp
--- networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.cpp 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.cpp 2011-04-20 14:53:34.894397093 +0200
@@ -57,6 +57,9 @@
QHash uuidToPath;
};
+#define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings"
+#define NM_DBUS_SERVICE_SYSTEM_SETTINGS "org.freedesktop.NetworkManagerSystemSettings"
+
const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String(NM_DBUS_SERVICE_SYSTEM_SETTINGS);
diff -ur networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.h networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.h
--- networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.h 2011-04-20 14:53:34.896397057 +0200
@@ -43,7 +43,7 @@
class KNM_EXPORT NMDBusSettingsService : public QObject, public ActivatableObserver, public ConnectionHandler
{
Q_OBJECT
-Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings")
+Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings")
public:
enum ServiceStatus { Available, AlreadyRunning, AccessDenied, UnknownError };
diff -ur networkmanagement-orig/backends/NetworkManager/nm-exported-connectioninterface.h networkmanagement-0.9/backends/NetworkManager/nm-exported-connectioninterface.h
--- networkmanagement-orig/backends/NetworkManager/nm-exported-connectioninterface.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/nm-exported-connectioninterface.h 2011-04-20 14:53:34.896397057 +0200
@@ -29,7 +29,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
- { return "org.freedesktop.NetworkManagerSettings.Connection"; }
+ { return "org.freedesktop.NetworkManager.Settings.Connection"; }
public:
OrgFreedesktopNetworkManagerSettingsConnectionInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
diff -ur networkmanagement-orig/backends/NetworkManager/nm-exported-connection-secrets-interface.h networkmanagement-0.9/backends/NetworkManager/nm-exported-connection-secrets-interface.h
--- networkmanagement-orig/backends/NetworkManager/nm-exported-connection-secrets-interface.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/nm-exported-connection-secrets-interface.h 2011-04-20 16:49:56.551556038 +0200
@@ -29,7 +29,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
- { return "org.freedesktop.NetworkManagerSettings.Connection.Secrets"; }
+ { return "org.freedesktop.NetworkManager.Settings.Connection.Secrets"; }
public:
OrgFreedesktopNetworkManagerSettingsConnectionSecretsInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
diff -ur networkmanagement-orig/backends/NetworkManager/nm-settingsinterface.h networkmanagement-0.9/backends/NetworkManager/nm-settingsinterface.h
--- networkmanagement-orig/backends/NetworkManager/nm-settingsinterface.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/nm-settingsinterface.h 2011-04-20 14:53:34.896397057 +0200
@@ -29,7 +29,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
- { return "org.freedesktop.NetworkManagerSettings"; }
+ { return "org.freedesktop.NetworkManager.Settings"; }
public:
OrgFreedesktopNetworkManagerSettingsInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
diff -ur networkmanagement-orig/backends/NetworkManager/nm-vpn-connectioninterface.h networkmanagement-0.9/backends/NetworkManager/nm-vpn-connectioninterface.h
--- networkmanagement-orig/backends/NetworkManager/nm-vpn-connectioninterface.h 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/nm-vpn-connectioninterface.h 2011-04-20 16:52:07.726103441 +0200
@@ -28,7 +28,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
- { return "org.freedesktop.NetworkManager.VPN.Connection"; }
+ { return "org.freedesktop.NetworkManagerCompat.VPN.Connection"; }
public:
OrgFreedesktopNetworkManagerVPNConnectionInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
diff -ur networkmanagement-orig/backends/NetworkManager/settings/gsmdbus.cpp networkmanagement-0.9/backends/NetworkManager/settings/gsmdbus.cpp
--- networkmanagement-orig/backends/NetworkManager/settings/gsmdbus.cpp 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/backends/NetworkManager/settings/gsmdbus.cpp 2011-04-20 14:53:34.894397093 +0200
@@ -35,7 +35,7 @@
if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
} else {
- setting->setNetworktype(NM_GSM_NETWORK_ANY);
+ setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
}
if (map.contains("band")) {
setting->setBand(map.value("band").value<int>());
@@ -58,7 +58,7 @@
map.insert("apn", setting->apn());
if (!setting->networkid().isEmpty())
map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
- if (setting->networktype() != NM_GSM_NETWORK_ANY) {
+ if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
}
Pouze v networkmanagement-0.9/backends/NetworkManager/settings: gsmdbus.cpp.orig
diff -ur networkmanagement-orig/NetworkManager-kde4.conf networkmanagement-0.9/NetworkManager-kde4.conf
--- networkmanagement-orig/NetworkManager-kde4.conf 2011-04-20 13:36:45.000000000 +0200
+++ networkmanagement-0.9/NetworkManager-kde4.conf 2011-04-20 14:53:34.896397057 +0200
@@ -14,23 +14,23 @@
<allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ send_interface="org.freedesktop.NetworkManager.Settings"/>
+ send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
<!-- Only root can get secrets -->
+ send_interface="org.freedesktop.NetworkManager.Settings.Connection.Secrets"/>
</policy>
<policy at_console="true">
<allow own="org.freedesktop.NetworkManagerUserSettings"/>
+ send_interface="org.freedesktop.NetworkManager.Settings"/>
+ send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
</policy>
<policy context="default">