From ec40e1075de6e89bc0d53e920e8d56fdfa5323e7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mar 10 2010 15:43:06 +0000 Subject: sync w/devel for plasmoid goodness --- diff --git a/.cvsignore b/.cvsignore index 98debfc..07e1d9f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -networkmanagement-0.9.tar.bz2 +networkmanagement-0.9-20100309.tar.bz2 diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec index 3c90607..71eca02 100644 --- a/kde-plasma-networkmanagement.spec +++ b/kde-plasma-networkmanagement.spec @@ -1,7 +1,14 @@ + +# define/set to include plasma applet +%define plasma_applet 1 +%define monolithic 1 + +%define snap 20100309 + Name: kde-plasma-networkmanagement Epoch: 1 Version: 0.9 -Release: 0.12.20100220%{?dist} +Release: 0.15.%{snap}%{?dist} Summary: NetworkManager KDE 4 integration Group: Applications/Internet @@ -9,11 +16,14 @@ License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2 URL: http://en.opensuse.org/KNetworkManager BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# adds to NM_* cmake build options used below. Mostly for testing purposes. +Patch1: networkmanagement-0.9-build_options.patch + # The source for this package was pulled from upstream's Subversion repository # using the create_tarball.rb script from kdesdk trunk: # ./create_tarball.rb -n -a networkmanagement # Please always use create_tarball.rb so translations get included. -Source0: networkmanagement-%{version}.tar.bz2 +Source0: networkmanagement-%{version}-%{snap}.tar.bz2 BuildRequires: kdelibs4-devel BuildRequires: kdebase-workspace-devel @@ -28,22 +38,22 @@ Requires: NetworkManager Obsoletes: kde-plasma-networkmanagement < 0.1-0.21 Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21 -# FIXME: Drop this? It makes trying out the plasmoid painful as the monolithic -# version autostarts. -- Kevin -Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +# FIXME/TODO: only wnat one of knetworkmanager or kde-plasma-networkmanagement installed +#Conflicts: knetworkmanager %description A Plasma applet to control your wired and wireless network(s) in KDE 4 using the default NetworkManager service. -This Plasma applet is alpha software with known issues. We recommend -knetworkmanager (the system tray version) for production use. - %package -n knetworkmanager Summary: NetworkManager KDE 4 integration Group: Applications/Internet Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release} +# FIXME/TODO: only wnat one of knetworkmanager or kde-plasma-networkmanagement installed +#Conflicts: kde-plasma-networkmanagement %description -n knetworkmanager KNetworkManager is a system tray applet for controlling network connections on systems that use the NetworkManager daemon. @@ -51,8 +61,6 @@ connections on systems that use the NetworkManager daemon. %package -n knetworkmanager-libs Summary: Runtime libraries for %{name} Group: System Environment/Libraries -# FIXME: What about people who want to try the experimental plasmoid? -- Kevin -Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} %{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}} %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release} @@ -62,8 +70,7 @@ Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release} %package -n knetworkmanager-openvpn Summary: OpenVPN support for knetworkmanager Group: Applications/Internet -# FIXME: What about people who want to try the experimental plasmoid? -- Kevin -Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: knetworkmanager-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: NetworkManager-openvpn Obsoletes: kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} Provides: kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release} @@ -74,8 +81,7 @@ Obsoletes: knetworkmanager4-openvpn < %{?epoch:%{epoch}:}%{version}-%{relea %package -n knetworkmanager-vpnc Summary: Vpnc support for knetworkmanager Group: Applications/Internet -# FIXME: What about people who want to try the experimental plasmoid? -- Kevin -Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: knetworkmanager-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: NetworkManager-vpnc Obsoletes: kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} Provides: kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} @@ -87,13 +93,20 @@ Obsoletes: knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} %prep %setup -q -n networkmanagement-%{version} +%patch1 -p1 -b .build_options + %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d +%{cmake_kde4} \ + -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d \ + %{?plasma_applet:-DNM_PLASMA_APPLET=BOOL:ON} \ + %{?monolithic:-DNM_MONOLITHIC=BOOL:ON} \ + .. popd + make %{?_smp_mflags} -C %{_target_platform} @@ -117,7 +130,7 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui. %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 || : @@ -133,31 +146,46 @@ 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 %postun -n knetworkmanager-libs -p /sbin/ldconfig +%files -f plasma_applet_networkmanagement.lang +%defattr(-,root,root,-) +%if 0%{?plasma_applet} +%{_kde4_appsdir}/desktoptheme/default/widgets/wireless.svgz +%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop +%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop +%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so +%{_kde4_libdir}/kde4/kded_networkmanagement.so +%endif + %files -n knetworkmanager -f knetworkmanager.lang %defattr(-,root,root,-) -%doc TODO DESIGN COPYING COPYING.LIB -%{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf -%{_kde4_libdir}/kde4/kcm_networkmanagement.so -%{_kde4_libdir}/kde4/networkmanagement_pptpui.so -%{_kde4_libexecdir}/networkmanagement_configshell +%if 0%{?monolithic} %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_iconsdir}/oxygen/*/*/* -%{_kde4_appsdir}/networkmanagement/ -%{_kde4_datadir}/kde4/services/kcm_networkmanagement.desktop -%{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop -%{_kde4_datadir}/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop %{_kde4_bindir}/knetworkmanager %{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop %{_kde4_datadir}/applications/kde4/knetworkmanager.desktop +%endif %files -n knetworkmanager-libs -f libknetworkmanager.lang %defattr(-,root,root,-) +%doc TODO DESIGN COPYING COPYING.LIB +%{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf +%{_kde4_libexecdir}/networkmanagement_configshell +%{_kde4_appsdir}/networkmanagement/ +%{_kde4_datadir}/kde4/services/kcm_networkmanagement.desktop +%{_kde4_datadir}/kde4/services/kcm_networkmanagement_tray.desktop +%{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop +%{_kde4_datadir}/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop +%{_kde4_libdir}/kde4/kcm_networkmanagement.so +%{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so +%{_kde4_libdir}/kde4/networkmanagement_pptpui.so %{_kde4_libdir}/libknmclient.so.4* %{_kde4_libdir}/libknminternals.so.4* %{_kde4_libdir}/libknmservice.so.4* @@ -181,17 +209,19 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || : %{_kde4_libdir}/kde4/networkmanagement_vpncui.so %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop -%files -n kde-plasma-networkmanagement -f plasma_applet_networkmanagement.lang -%defattr(-,root,root,-) -%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop -%{_kde4_datadir}/kde4/services/kcm_networkmanagement_tray.desktop -%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop -%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so -%{_kde4_libdir}/kde4/kded_networkmanagement.so -%{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so - %changelog +* Tue Mar 09 2010 Rex Dieter 1:0.9-0.15.20100309svn +- move common items to -libs, make knm,-nm installable separately. + +* Tue Mar 09 2010 Rex Dieter 1:0.9-0.14.20100309svn +- 200100309 snapshot +- on queue, plasmoid reportedly ready for wider testing, re-enabling (#571433) + +* Mon Mar 08 2010 Rex Dieter 1:0.9-0.13.20100220svn +- make kde-plasma-neworkmanagment an empty placeholder package (#571433) +- knetworkmanager: move kcm_networkmanagement_tray bits here (from kde-plasma-nm) + * Sun Feb 21 2010 Kevin Kofler 1:0.9-0.12.20100220svn - update to revision 1093233 (2010-02-20) - use user-readable URL instead of outdated websvn link diff --git a/networkmanagement-0.9-build_options.patch b/networkmanagement-0.9-build_options.patch new file mode 100644 index 0000000..b1a1431 --- /dev/null +++ b/networkmanagement-0.9-build_options.patch @@ -0,0 +1,24 @@ +diff -up networkmanagement-0.9/CMakeLists.txt.no_applet networkmanagement-0.9/CMakeLists.txt +--- networkmanagement-0.9/CMakeLists.txt.no_applet 2010-03-09 10:31:48.000000000 -0600 ++++ networkmanagement-0.9/CMakeLists.txt 2010-03-09 14:41:30.135464981 -0600 +@@ -36,15 +36,19 @@ include_directories( + ${CMAKE_CURRENT_BUILD_DIR} + ) + ++if (NM_PLASMA_APPLET) + add_subdirectory(applet) ++add_subdirectory(kded) ++endif (NM_PLASMA_APPLET) + add_subdirectory(backends) + add_subdirectory(libs) + add_subdirectory(tests) + add_subdirectory(settings) + add_subdirectory(vpnplugins) + add_subdirectory(solidcontrolfuture) ++if (NM_MONOLITHIC) + add_subdirectory(monolithic) +-add_subdirectory(kded) ++endif (NM_MONOLITHIC) + + install( FILES networkmanagement.notifyrc DESTINATION ${DATA_INSTALL_DIR}/networkmanagement ) + diff --git a/sources b/sources index ad3bb96..09dcd50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c07ea47ff858b04b72daf6193f0ecdd networkmanagement-0.9.tar.bz2 +11725d72b0e3e350c711e21c43e3d42a networkmanagement-0.9-20100309.tar.bz2