From 2ad6675046a92aef1fd3e7ed8a9236de156ae006 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 14 Apr 2019 02:00:47 +0000 Subject: [PATCH 1/7] MassBuild#1671: Increase release tag --- knetworkmanager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knetworkmanager.spec b/knetworkmanager.spec index 19dd763..ace4502 100644 --- a/knetworkmanager.spec +++ b/knetworkmanager.spec @@ -13,7 +13,7 @@ Summary: KDE NetworkManager Name: knetworkmanager Version: 0.9.0.12 -Release: 5 +Release: 6 Epoch: 2 License: (GPLv2+ or GPLv3+) and GPLv2+ and LGPLv2+ and LGPLv2+ Group: Graphical desktop/KDE From d4582bcb7bcb6f85fefbbf803366130f71ada4dc Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 04:07:18 +0300 Subject: [PATCH 2/7] bot: rpm5 -> rpm4 (1) --- knetworkmanager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knetworkmanager.spec b/knetworkmanager.spec index ace4502..043a0c3 100644 --- a/knetworkmanager.spec +++ b/knetworkmanager.spec @@ -362,7 +362,7 @@ cp %{SOURCE2} po/ru/libknetworkmanager.po %make %install -%makeinstall_std -C build +%make_install -C build %if ! %{novellvpn} rm %{buildroot}%{_kde_libdir}/kde4/networkmanagement_novellvpnui.so From b852249900f1ba7fb6bcac910425701fe22ff5be Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 22:12:50 +0300 Subject: [PATCH 3/7] bot: rpm5 -> rpm4 (3) --- knetworkmanager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knetworkmanager.spec b/knetworkmanager.spec index 043a0c3..be74d58 100644 --- a/knetworkmanager.spec +++ b/knetworkmanager.spec @@ -359,7 +359,7 @@ cp %{SOURCE2} po/ru/libknetworkmanager.po %cmake_kde4 \ -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d \ -DINSTALL_KNM_AUTOSTART=ON -%make +%make_build %install %make_install -C build From c28dbbd41b90397a0d0ab34002ab522b8015c25f Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 6 Jan 2020 06:04:47 +0300 Subject: [PATCH 4/7] bot: rpm5 -> rpm4 (6) --- knetworkmanager.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/knetworkmanager.spec b/knetworkmanager.spec index be74d58..54ca757 100644 --- a/knetworkmanager.spec +++ b/knetworkmanager.spec @@ -400,4 +400,3 @@ You need to use now the plasma applet. Regards, EOF - From f1fd189911a54e75f1064b1657f913298338123d Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 13 Jan 2020 15:34:45 +0300 Subject: [PATCH 5/7] bot: rpm5 -> rpm4 (8) --- knetworkmanager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/knetworkmanager.spec b/knetworkmanager.spec index 54ca757..0c69f10 100644 --- a/knetworkmanager.spec +++ b/knetworkmanager.spec @@ -359,10 +359,10 @@ cp %{SOURCE2} po/ru/libknetworkmanager.po %cmake_kde4 \ -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d \ -DINSTALL_KNM_AUTOSTART=ON -%make_build +%make %install -%make_install -C build +%makeinstall_std -C build %if ! %{novellvpn} rm %{buildroot}%{_kde_libdir}/kde4/networkmanagement_novellvpnui.so From 86b672973fe1cf9c24a3f7edc8cce392c18952a8 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 28 Dec 2020 12:35:27 +0300 Subject: [PATCH 6/7] update BRs for new NetworkManager --- knetworkmanager.spec | 7 ++-- networkmanagement-0.9.0.12-brs.patch | 53 ++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 networkmanagement-0.9.0.12-brs.patch diff --git a/knetworkmanager.spec b/knetworkmanager.spec index 0c69f10..5fdb8e5 100644 --- a/knetworkmanager.spec +++ b/knetworkmanager.spec @@ -13,7 +13,7 @@ Summary: KDE NetworkManager Name: knetworkmanager Version: 0.9.0.12 -Release: 6 +Release: 7 Epoch: 2 License: (GPLv2+ or GPLv3+) and GPLv2+ and LGPLv2+ and LGPLv2+ Group: Graphical desktop/KDE @@ -25,11 +25,12 @@ Source100: knetworkmanager.rpmlintrc Patch0: networkmanagement-0.9-useversion.patch Patch1: networkmanagement-0.9-compile-po-files.patch Patch4: networkmanagement-0.9.0.2-ui-fix.patch +# Newer NM changed libraries +Patch5: networkmanagement-0.9.0.12-brs.patch BuildRequires: mobile-broadband-provider-info BuildRequires: kdebase4-workspace-devel -BuildRequires: pkgconfig(libnm-util) >= 0.9 -BuildRequires: pkgconfig(libnm-glib) >= 0.9 +BuildRequires: pkgconfig(libnm) %if %{openconnect} BuildRequires: pkgconfig(openconnect) >= 3.10 %endif diff --git a/networkmanagement-0.9.0.12-brs.patch b/networkmanagement-0.9.0.12-brs.patch new file mode 100644 index 0000000..fa39b54 --- /dev/null +++ b/networkmanagement-0.9.0.12-brs.patch @@ -0,0 +1,53 @@ +diff -ur networkmanagement-0.9.0.12.orig/CMakeLists.txt networkmanagement-0.9.0.12/CMakeLists.txt +--- networkmanagement-0.9.0.12.orig/CMakeLists.txt 2020-12-28 12:43:26.738814176 +0300 ++++ networkmanagement-0.9.0.12/CMakeLists.txt 2020-12-28 13:14:32.038590757 +0300 +@@ -24,32 +24,20 @@ + + #include(ConfigureChecks.cmake) + +-find_package(NetworkManager ${MINIMUM_NM_VERSION_REQUIRED}) +- +-if (NETWORKMANAGER_FOUND) + find_package(PkgConfig) +- PKG_SEARCH_MODULE( NM-UTIL libnm-util ) +- PKG_SEARCH_MODULE( NM-GLIB libnm-glib ) ++ PKG_SEARCH_MODULE( NM-UTIL libnm ) + +- if (NOT (NM-UTIL_FOUND AND NM-GLIB_FOUND)) +- message(FATAL_ERROR "Could NOT find libnm-util or libnm-glib, check FindPkgConfig output above!") +- endif (NOT (NM-UTIL_FOUND AND NM-GLIB_FOUND)) ++ if (NOT (NM-UTIL_FOUND)) ++ message(FATAL_ERROR "Could NOT find libnm, check FindPkgConfig output above!") ++ endif (NOT (NM-UTIL_FOUND)) + + configure_file(backends/NetworkManager/config-nm09backend.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/backends/NetworkManager/config-nm09backend.h ) + +- if (${NETWORKMANAGER_VERSION} VERSION_GREATER ${MINIMUM_NM_VERSION_REQUIRED} OR +- ${NETWORKMANAGER_VERSION} VERSION_EQUAL ${MINIMUM_NM_VERSION_REQUIRED}) +- +- if (${NETWORKMANAGER_VERSION} VERSION_LESS "0.9.8") +- message(WARNING "Unfortunately with NetworkManager < 0.9.8 we cannot correctly detect when the connection is deactivated (see http://bugs.kde.org/320533)") +- endif() +- + set(NM_0_9 TRUE) + add_definitions(-DMINIMUM_NM_VERSION_REQUIRED=\\"${MINIMUM_NM_VERSION_REQUIRED}\\") + include_directories( + ${NETWORKMANAGER_INCLUDE_DIRS} + ${NM-UTIL_INCLUDE_DIRS} +- ${NM-GLIB_INCLUDE_DIRS} + ${CMAKE_CURRENT_BUILD_DIR} + solidcontrolfuture/libs + ${KDE4_INCLUDE_DIR}/solid/control +@@ -69,12 +57,6 @@ + #add_subdirectory(monolithic) + + install( FILES networkmanagement.notifyrc DESTINATION ${DATA_INSTALL_DIR}/networkmanagement ) +- else() +- message(FATAL_ERROR "ERROR: NetworkManager version '${NETWORKMANAGER_VERSION}' does not match minimum required (${MINIMUM_NM_VERSION_REQUIRED})") +- endif() +-else(NETWORKMANAGER_FOUND) +- message(FATAL_ERROR "ERROR: NetworkManager headers >= ${MINIMUM_NM_VERSION_REQUIRED} not installed. http://projects.gnome.org/NetworkManager/") +-endif(NETWORKMANAGER_FOUND) + + if(INSTALL_KNM_AUTOSTART) + message("Installing autostart file for knm, use cmake -DINSTALL_KNM_AUTOSTART=ON to switch it on. Note that this will break the plasmoid. For this to work, make sure the kded DBus service is NOT loaded.") From f179aa7197903c6a084f0b7b4076d6047be26bd2 Mon Sep 17 00:00:00 2001 From: Aleksandr Proklov Date: Sun, 21 Feb 2021 09:47:32 +0900 Subject: [PATCH 7/7] DEPRECATED use plasma-nm --- knetworkmanager.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/knetworkmanager.spec b/knetworkmanager.spec index 5fdb8e5..a002f14 100644 --- a/knetworkmanager.spec +++ b/knetworkmanager.spec @@ -1,3 +1,5 @@ +# DEPRECATED use plasma-nm insted + %define srcname networkmanagement %define devname %mklibname -d knetworkmanager