- rel 5; get rid with solidbackends dir

diff --git a/kde4-knetworkmanager-solid.patch b/kde4-knetworkmanager-solid.patch
new file mode 100644 (file)
index 0000000..7b1762d
--- /dev/null
+++ b/kde4-knetworkmanager-solid.patch
@@ -0,0 +1,22 @@
+diff -urN networkmanagement-0.9.0.10-orig/solidcontrolfuture/solid/modemmanager-0.5/CMakeLists.txt networkmanagement-0.9.0.10/solidcontrolfuture/solid/modemmanager-0.5/CMakeLists.txt
+--- networkmanagement-0.9.0.10-orig/solidcontrolfuture/solid/modemmanager-0.5/CMakeLists.txt   2013-11-28 12:13:34.000000000 +0100
++++ networkmanagement-0.9.0.10/solidcontrolfuture/solid/modemmanager-0.5/CMakeLists.txt        2014-02-04 21:44:47.138255068 +0100
+@@ -43,6 +43,6 @@
+ target_link_libraries(solid_modemmanager05 ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} solidcontrolnm09 solidcontrolnm09ifaces)
+ install(TARGETS solid_modemmanager05 DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+-install(FILES solid_modemmanager05.desktop DESTINATION ${SERVICES_INSTALL_DIR}/solidbackends )
++install(FILES solid_modemmanager05.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ 
+ kde4_install_icons( ${ICON_INSTALL_DIR} )
+diff -urN networkmanagement-0.9.0.10-orig/solidcontrolfuture/solid/networkmanager-0.9/CMakeLists.txt networkmanagement-0.9.0.10/solidcontrolfuture/solid/networkmanager-0.9/CMakeLists.txt
+--- networkmanagement-0.9.0.10-orig/solidcontrolfuture/solid/networkmanager-0.9/CMakeLists.txt 2013-11-28 12:13:34.000000000 +0100
++++ networkmanagement-0.9.0.10/solidcontrolfuture/solid/networkmanager-0.9/CMakeLists.txt      2014-02-04 21:44:39.708295319 +0100
+@@ -58,6 +58,6 @@
+ target_link_libraries(solid_networkmanager09 ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} solidcontrolnm09 solidcontrolnm09ifaces)
+ install(TARGETS solid_networkmanager09 DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+-install(FILES solid_networkmanager09.desktop DESTINATION ${SERVICES_INSTALL_DIR}/solidbackends )
++install(FILES solid_networkmanager09.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ 
+ kde4_install_icons( ${ICON_INSTALL_DIR} )

diff --git a/kde4-knetworkmanager.spec b/kde4-knetworkmanager.spec
index fa6f5d750c8ccc215a914a3b699d2a8fe1669c57..8eaeb37f1505015c1ed30dc7b69fd9b74f9247b6 100644 (file)
--- a/kde4-knetworkmanager.spec
+++ b/kde4-knetworkmanager.spec
@@ -8,7 +8,7 @@
 Summary:       Plasma applet that controls network via NetworkManager backend
 Name:          kde4-knetworkmanager
 Version:       0.9.0.10
-Release:       4
+Release:       5
 Epoch:         1
 License:       GPL v2
 Group:         X11/Applications
@@ -17,6 +17,7 @@ Group:                X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/%{version}/src/%{origname}-%{version}.tar.xz
 # Source0-md5: 9b75b0b731a75fd6c43a85d087d36bf4
 Patch0:        %{origname}-kill_rest_sr.patch
+Patch0:        %{name}-solid.patch
 URL:           http://en.opensuse.org/Projects/KNetworkManager
 BuildRequires: NetworkManager-devel >= 2:0.9.8
 BuildRequires: Qt3Support-devel >= %{qtver}
@@ -119,7 +120,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kde4/services/*.desktop
 %{_datadir}/kde4/services/kded/*.desktop
 %{_datadir}/kde4/servicetypes/*.desktop
-%{_datadir}/kde4/services/solidbackends/*.desktop
 %{_iconsdir}/oxygen/*x*/devices/network-wireless*.png
 %{_iconsdir}/oxygen/*x*/devices/network-wired-activated.png
 %{_iconsdir}/oxygen/*x*/devices/network-defaultroute.png