[kde-plasma-networkmanagement] - 20100920 snapshot - Obsoletes: knetworkmanager (if built against kde-4.5)
Rex Dieter
rdieter at fedoraproject.org
Mon Sep 20 15:51:52 UTC 2010
commit 8b26138d317a0dfbd8fa857426efedc5a6e39e8d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Sep 20 10:57:20 2010 -0500
- 20100920 snapshot
- Obsoletes: knetworkmanager (if built against kde-4.5)
.gitignore | 3 +-
kde-plasma-networkmanagement.spec | 91 ++++++++++++++-----------------
networkmanagement-0.9-kutils_libs.patch | 54 ------------------
networkmanagement-kdebug238325.patch | 46 ----------------
sources | 2 +-
5 files changed, 42 insertions(+), 154 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35e8428..a6bbc58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-networkmanagement-0.9-20100603.tar.bz2
-/networkmanagement-0.9-20100830.tar.bz2
+/networkmanagement-0.9-20100920.tar.bz2
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 07d495b..811a83f 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,14 +1,10 @@
-# define/set to include plasma applet
-%define plasma_applet 1
-%define monolithic 1
-
-%define snap 20100830
+%define snap 20100920
Name: kde-plasma-networkmanagement
Epoch: 1
Version: 0.9
-Release: 0.23.%{snap}%{?dist}
+Release: 0.24.%{snap}%{?dist}
Summary: NetworkManager KDE 4 integration
Group: Applications/Internet
@@ -30,15 +26,14 @@ Patch2: networkmanagement-0.9-disable_kded.patch
## upstreamable patches
# Adding "Enable networking" button to knetworkmanager
-# https://bugs.kde.org/238325
+# https://bugs.kde.org/238325 , patch below includes non-upstreamed
+# support for monolithic knetworkmanager
Patch50: networkmanagement-kdebug238325.patch
-# knetworkmanager doesn´t recognize BSSID
+# knetworkmanager doesn´t recognize BSSID
# https://bugs.kde.org/238046
Patch51: networkmanagement-bssid.patch
## upstream patches
-# fix build for kde-4.4.x
-Patch100: networkmanagement-0.9-kutils_libs.patch
BuildRequires: kdelibs4-devel
BuildRequires: kdebase-workspace-devel
@@ -54,15 +49,20 @@ Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-# only want one of knetworkmanager-autostart or kde-plasma-networkmanagement installed
-#Conflicts: knetworkmanager-autostart
-
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+
+# define/set to include plasma applet
+%define plasma_applet 1
%if "%{?_kde4_version}" < "4.4.76"
+%define monolithic 1
+%error
Conflicts: kdebase-runtime > 4.4.76
%endif
+%if ! 0%{?monolithic}
+Obsoletes: knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
%description
A Plasma applet to control your wired and wireless network(s) in KDE 4 using
the default NetworkManager service.
@@ -71,16 +71,6 @@ This Plasma applet is beta software with known issues and is available for
testing purposes only. We recommend using knetworkmanager (the system tray
version) for production use.
-%package -n kde-plasma-networkmanagement-autostart
-Summary: autostart support for kde-plasma-networkmanagement
-Group: Applications/Internet
-Requires: kde-plasma-networkmanagement = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: kde-plasma-networkmanagement < 1:0.9-0.20
-# only want one of knetworkmanager or kde-plasma-networkmanagement installed
-#Conflicts: knetworkmanager
-%description -n kde-plasma-networkmanagement-autostart
-%{summary}.
-
%package -n knetworkmanager
Summary: NetworkManager KDE 4 integration
Group: Applications/Internet
@@ -90,16 +80,6 @@ Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
KNetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
-%package -n knetworkmanager-autostart
-Summary: autostart support for knetworkmanager
-Group: Applications/Internet
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: knetworkmanager < 1:0.9-0.20
-# only want one of knetworkmanager or kde-plasma-networkmanagement installed
-Conflicts: kde-plasma-networkmanagement
-%description -n knetworkmanager-autostart
-%{summary}.
-
%package -n knetworkmanager-libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
@@ -156,12 +136,11 @@ Obsoletes: knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
%setup -q -n networkmanagement-%{version}
%patch1 -p1 -b .build_options
-%if 0%{?fedora} && 0%{?fedora} < 14
+%if 0%{?monolithic}
%patch2 -p1 -b .disable_kded
%endif
%patch50 -p0 -b .kdebug238325
%patch51 -p0 -b .bssid
-%patch100 -p1 -b .kutils_libs
%build
@@ -193,7 +172,11 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui.
rm -fv %{buildroot}%{_kde4_libdir}/kde4/networkmanagement_strongswanui.so
rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_strongswanui.desktop
+%if 0%{?monolithic}
%find_lang knetworkmanager --with-kde
+%else
+rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetworkmanager.mo
+%endif
%find_lang libknetworkmanager
%find_lang plasma_applet_networkmanagement
@@ -201,27 +184,34 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_strongswanui
%clean
rm -rf %{buildroot}
+
%if 0%{?monolithic}
%post -n knetworkmanager
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
%postun -n knetworkmanager
if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
- touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
- gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
fi
%posttrans -n knetworkmanager
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%endif
-%post -n knetworkmanager-libs -p /sbin/ldconfig
+%post -n knetworkmanager-libs
+/sbin/ldconfig
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-%postun -n knetworkmanager-libs -p /sbin/ldconfig
+%postun -n knetworkmanager-libs
+/sbin/ldconfig
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
+fi
+
+%posttrans -n knetworkmanager-libs
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%files -f plasma_applet_networkmanagement.lang
@@ -233,22 +223,17 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
-#files autostart
-#defattr(-,root,root,-)
-%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
%{_kde4_libdir}/kde4/kded_networkmanagement.so
%endif
+%if 0%{?monolithic}
%files -n knetworkmanager -f knetworkmanager.lang
%defattr(-,root,root,-)
-%if 0%{?monolithic}
%{_kde4_bindir}/knetworkmanager
%{_kde4_datadir}/applications/kde4/knetworkmanager.desktop
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_iconsdir}/oxygen/*/*/*
-#files -n knetworkmanager-autostart
-#defattr(-,root,root,-)
%{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/knetworkmanager.*
+%endif
%files -n knetworkmanager-libs -f libknetworkmanager.lang
%defattr(-,root,root,-)
@@ -259,6 +244,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%{_kde4_datadir}/kde4/services/kcm_networkmanagement.desktop
%{_kde4_datadir}/kde4/services/kcm_networkmanagement_tray.desktop
%{_kde4_datadir}/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop
+%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_libdir}/kde4/kcm_networkmanagement.so
%{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so
%{_kde4_libdir}/libknmclient.so.4*
@@ -288,10 +274,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/networkmanagement_pptpui.so
%{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
-%endif
%changelog
+* Mon Sep 20 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.24.20100920
+- 20100920 snapshot
+- Obsoletes: knetworkmanager (if built against kde-4.5)
+
* Tue Sep 14 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.23.20100830
- knetworkmanager doesn´t recognize BSSID (kde#238046)
diff --git a/networkmanagement-kdebug238325.patch b/networkmanagement-kdebug238325.patch
index eda286b..8eb1e35 100644
--- a/networkmanagement-kdebug238325.patch
+++ b/networkmanagement-kdebug238325.patch
@@ -1,49 +1,3 @@
-Index: applet/nmpopup.h
-===================================================================
---- applet/nmpopup.h (revision 1128863)
-+++ applet/nmpopup.h (working copy)
-@@ -30,6 +30,7 @@
- #include <Plasma/PushButton>
- #include <Plasma/TabBar>
-
-+#include <solid/networking.h>
- #include <solid/control/networkinterface.h>
-
- #include "activatable.h"
-@@ -65,6 +66,7 @@
- void managerWirelessHardwareEnabledChanged(bool);
- void wirelessEnabledToggled(bool checked);
- void networkingEnabledToggled(bool checked);
-+ void managerNetworkingEnabledChanged(bool);
- void manageConnections();
- void showMore();
- void showMore(bool);
-Index: applet/nmpopup.cpp
-===================================================================
---- applet/nmpopup.cpp (revision 1128863)
-+++ applet/nmpopup.cpp (working copy)
-@@ -118,6 +118,8 @@
- m_leftLayout->addItem(m_networkingCheckBox);
- connect(m_networkingCheckBox, SIGNAL(toggled(bool)),
- this, SLOT(networkingEnabledToggled(bool)));
-+ connect(Solid::Control::NetworkManager::notifier(), SIGNAL(networkingEnabledChanged(bool)),
-+ this, SLOT(managerNetworkingEnabledChanged(bool)));
-
- // flight-mode checkbox
- m_rfCheckBox = new Plasma::CheckBox(m_leftWidget);
-@@ -384,6 +386,12 @@
- m_rfCheckBox->setEnabled(!enabled);
- }
-
-+void NMPopup::managerNetworkingEnabledChanged(bool enabled)
-+{
-+ kDebug() << "NM daemon changed networking enable state" << enabled;
-+ m_networkingCheckBox->setChecked(Solid::Control::NetworkManager::isNetworkingEnabled());
-+}
-+
- void NMPopup::showMore()
- {
- showMore(m_showMoreButton->isChecked());
Index: monolithic/knetworkmanagertrayicon.h
===================================================================
--- monolithic/knetworkmanagertrayicon.h (revision 1128863)
diff --git a/sources b/sources
index e036030..39b55e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b21f475973230b0ef2f9dbd95f74bd3 networkmanagement-0.9-20100830.tar.bz2
+80052358b977a78a3cf57ec1797d5ac8 networkmanagement-0.9-20100920.tar.bz2
More information about the scm-commits
mailing list