public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/plasma-nm] epel10: Merge branch f43 into epel10
@ 2026-07-30 17:17 Troy Dawson
  0 siblings, 0 replies; only message in thread
From: Troy Dawson @ 2026-07-30 17:17 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/plasma-nm
Branch : epel10
Commit : e7b2b2585dae70ea6d6197a9aaa4ef9a4bc66ec2
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-07-30T10:17:38-07:00
Stats  : +66/-5 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/plasma-nm/c/e7b2b2585dae70ea6d6197a9aaa4ef9a4bc66ec2?branch=epel10

Log:
Merge branch f43 into epel10

---
diff --git a/.gitignore b/.gitignore
index 3316eda..8d88e49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,10 @@
 /plasma-nm-6.6.2.tar.xz.sig
 /plasma-nm-6.6.3.tar.xz.sig
 /plasma-nm-6.6.4.tar.xz.sig
+/plasma-nm-6.6.5.tar.xz.sig
+/plasma-nm-6.6.90.tar.xz.sig
+/plasma-nm-6.6.91.tar.xz.sig
+/plasma-nm-6.7.0.tar.xz.sig
+/plasma-nm-6.7.1.tar.xz.sig
+/plasma-nm-6.7.2.tar.xz.sig
+/plasma-nm-6.7.3.tar.xz.sig

diff --git a/plasma-nm.spec b/plasma-nm.spec
index 5892257..902a934 100644
--- a/plasma-nm.spec
+++ b/plasma-nm.spec
@@ -4,7 +4,7 @@ ExcludeArch: %{ix86}
 
 Name:    plasma-nm
 Summary: Plasma for managing network connections
-Version: 6.6.4
+Version: 6.7.3
 Release: 1.1%{?dist}
 
 License: BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)
@@ -31,6 +31,7 @@ BuildRequires:  extra-cmake-modules
 BuildRequires:  qt6-qtbase-devel
 BuildRequires:  cmake(QCoro6)
 BuildRequires:  cmake(Qca-qt6)
+BuildRequires:  cmake(Qt6Keychain)
 
 BuildRequires:  cmake(KF6I18n)
 BuildRequires:  cmake(KF6KCMUtils)
@@ -47,13 +48,21 @@ BuildRequires:  cmake(KF6Declarative)
 BuildRequires:  cmake(KF6NetworkManagerQt)
 BuildRequires:  cmake(KF6ModemManagerQt)
 BuildRequires:  cmake(KF6Svg)
+BuildRequires:  cmake(KF6QuickCharts)
+# For some reason, it's not pulling it up on s390x
+BuildRequires:  pkgconfig(libcrypto)
 
 # Plasma
 BuildRequires:  cmake(Plasma)
 
+# Others
+BuildRequires:  pkgconfig(cups)
+
 # Runtime check
 BuildRequires:  cmake(KF6Prison)
 BuildRequires:  cmake(KF6Kirigami2)
+BuildRequires:  qt6qml(org.kde.kirigamiaddons.formcard)
+Requires:       qt6qml(org.kde.kirigamiaddons.formcard)
 
 BuildRequires:  pkgconfig(ModemManager) >= 1.0.0
 BuildRequires:  pkgconfig(libnm) >= 1.0.0
@@ -253,6 +262,7 @@ rm -f %{buildroot}/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openco
 %{_kf6_datadir}/knotifications6/networkmanagement.notifyrc
 # plasma-nm kded
 %{_kf6_plugindir}/kded/networkmanagement.so
+%{_libdir}/libplasmanm_cellular.so
 
 # kcm
 %{_qt6_plugindir}/plasma/kcms/systemsettings_qwidgets/kcm_networkmanagement.so
@@ -316,10 +326,37 @@ rm -f %{buildroot}/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openco
 %endif
 
 %changelog
-* Thu Apr 30 2026 Troy Dawson <tdawson@redhat.com> - 6.6.4-1.1
+* Thu Apr 30 2026 Troy Dawson <tdawson@redhat.com> - 6.7.3-1.1
 - Drop sub-packages whose dependencies are not in epel10 yet
   plasma-nm-{fortisslvpn,sstp}
 
+* Tue Jul 14 2026 Steve Cossette <farchord@gmail.com> - 6.7.3-1
+- 6.7.3
+
+* Wed Jul 01 2026 Steve Cossette <farchord@gmail.com> - 6.7.2-1
+- 6.7.2
+
+* Tue Jun 23 2026 Steve Cossette <farchord@gmail.com> - 6.7.1-1
+- 6.7.1
+
+* Thu Jun 11 2026 Steve Cossette <farchord@gmail.com> - 6.7.0-1
+- 6.7.0
+
+* Fri May 29 2026 Steve Cossette <farchord@gmail.com> - 6.6.91-1
+- 6.6.91
+
+* Sat May 16 2026 Steve Cossette <farchord@gmail.com> - 6.6.90-1
+- 6.6.90
+
+* Thu May 14 2026 Steve Cossette <farchord@gmail.com> - 6.6.5-1
+- 6.6.5
+
+* Thu May 14 2026 Jan Grulich <jgrulich@redhat.com> - 6.6.4-3
+- Rebuild (qt6)
+
+* Fri Apr 17 2026 Jan Grulich <jgrulich@redhat.com> - 6.6.4-2
+- Rebuild (qt6)
+
 * Fri Apr 10 2026 Steve Cossette <farchord@gmail.com> - 6.6.4-1
 - 6.6.4
 

diff --git a/sources b/sources
index 2aac841..adee43c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (plasma-nm-6.6.4.tar.xz) = a2bd42343bcd25da68f1699c9c0632b4f22a544b6c8880a977192744d888164c28e2559bfbe8a408c26826001c4d173b3d413f4f86eb12f62684aafb58531e3c
-SHA512 (plasma-nm-6.6.4.tar.xz.sig) = 6599b46ad08403d9ec051e18a2c809834e82885d1009e5be84d7906539c3b0e66278895ebd6d476fe138f7dadda8774e1e46d0ea1a8d86d49087d8d7ee5f8668
+SHA512 (plasma-nm-6.7.3.tar.xz) = 81964fd7643ad3647a8aff260dd6b32904e36fc4a62f75688138c9791be1d0fc1f319de1579cea5da9d3dcc58bdb44bf95d2f247c2a0d5852ece004846050fe8
+SHA512 (plasma-nm-6.7.3.tar.xz.sig) = 3014bd2165e39c1c4f978756fd3f553c1a7d6d834379c123d8f0634d94610f9282884707cc346f10e76511a5a06d8a549b14734d3eeb80cc4a2d12ccd372dff4

diff --git a/plasma-nm.spec b/plasma-nm.spec
index f3a5d81..902a934 100644
--- a/plasma-nm.spec
+++ b/plasma-nm.spec
@@ -5,7 +5,7 @@ ExcludeArch: %{ix86}
 Name:    plasma-nm
 Summary: Plasma for managing network connections
 Version: 6.7.3
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 
 License: BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)
 URL:     https://invent.kde.org/plasma/%{name}
@@ -204,6 +204,13 @@ Requires:       NetworkManager-iodine
 %install
 %cmake_install
 
+# Move these out until they are available in epel10
+%if ! 0%{?fedora}
+rm -f %{buildroot}%{_kf6_qtplugindir}/plasma/network/vpn/plasmanetworkmanagement_sstpui.so
+rm -f %{buildroot}%{_kf6_qtplugindir}/plasma/network/vpn/plasmanetworkmanagement_fortisslvpnui.so
+rm -f %{buildroot}/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_sstpui.mo
+rm -f %{buildroot}/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_fortisslvpnui.mo
+%endif
 %if ! 0%{?fedora}
 rm -f %{buildroot}%{_kf6_qtplugindir}/plasma/network/vpn/plasmanetworkmanagement_vpncui.so
 rm -f %{buildroot}%{_kf6_qtplugindir}/plasma/network/vpn/plasmanetworkmanagement_sshui.so
@@ -232,8 +239,11 @@ rm -f %{buildroot}/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openco
 %find_lang plasmanetworkmanagement_strongswanui
 %find_lang plasmanetworkmanagement_l2tpui
 %find_lang plasmanetworkmanagement_pptpui
+# Move these out until they are available in epel10
+%if 0%{?fedora}
 %find_lang plasmanetworkmanagement_sstpui
 %find_lang plasmanetworkmanagement_fortisslvpnui
+%endif
 %if 0%{?fedora}
 %find_lang plasmanetworkmanagement_vpncui
 %find_lang plasmanetworkmanagement_sshui
@@ -295,11 +305,14 @@ rm -f %{buildroot}/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openco
 %files pptp -f plasmanetworkmanagement_pptpui.lang
 %{_kf6_qtplugindir}/plasma/network/vpn/plasmanetworkmanagement_pptpui.so
 
+# Move these out until they are available in epel10
+%if 0%{?fedora}
 %files sstp -f plasmanetworkmanagement_sstpui.lang
 %{_kf6_qtplugindir}/plasma/network/vpn/plasmanetworkmanagement_sstpui.so
 
 %files fortisslvpn -f plasmanetworkmanagement_fortisslvpnui.lang
 %{_kf6_qtplugindir}/plasma/network/vpn/plasmanetworkmanagement_fortisslvpnui.so
+%endif
 
 %if 0%{?fedora}
 %files vpnc -f plasmanetworkmanagement_vpncui.lang
@@ -313,6 +326,10 @@ rm -f %{buildroot}/usr/share/locale/*/LC_MESSAGES/plasmanetworkmanagement_openco
 %endif
 
 %changelog
+* Thu Apr 30 2026 Troy Dawson <tdawson@redhat.com> - 6.7.3-1.1
+- Drop sub-packages whose dependencies are not in epel10 yet
+  plasma-nm-{fortisslvpn,sstp}
+
 * Tue Jul 14 2026 Steve Cossette <farchord@gmail.com> - 6.7.3-1
 - 6.7.3
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-30 17:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-30 17:17 [rpms/plasma-nm] epel10: Merge branch f43 into epel10 Troy Dawson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox