public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/plasma-nm] epel10: Merge branch f44 into epel10
Date: Fri, 11 Sep 2026 18:56:36 GMT	[thread overview]
Message-ID: <178915299660.1.10458915064602268386.rpms-plasma-nm-34cd70362ead@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/plasma-nm
Branch : epel10
Commit : 34cd70362ead44476613b4466092664089f545a9
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-09-11T11:56:21-07:00
Stats  : +33/-5 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/plasma-nm/c/34cd70362ead44476613b4466092664089f545a9?branch=epel10

Log:
Merge branch f44 into epel10

---
diff --git a/.gitignore b/.gitignore
index 8d88e49..c9a0db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@
 /plasma-nm-6.7.1.tar.xz.sig
 /plasma-nm-6.7.2.tar.xz.sig
 /plasma-nm-6.7.3.tar.xz.sig
+/plasma-nm-6.7.4.tar.xz.sig
+/plasma-nm-6.7.5.tar.xz.sig

diff --git a/plasma-nm.spec b/plasma-nm.spec
index 902a934..cb2d9a3 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.7.3
+Version: 6.7.5
 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)
@@ -326,10 +326,19 @@ 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
+* Thu Apr 30 2026 Troy Dawson <tdawson@redhat.com> - 6.7.5-1.1
 - Drop sub-packages whose dependencies are not in epel10 yet
   plasma-nm-{fortisslvpn,sstp}
 
+* Tue Sep 08 2026 Steve Cossette <farchord@gmail.com> - 6.7.5-1
+- 6.7.5
+
+* Tue Aug 04 2026 Steve Cossette <farchord@gmail.com> - 6.7.4-1
+- 6.7.4
+
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Tue Jul 14 2026 Steve Cossette <farchord@gmail.com> - 6.7.3-1
 - 6.7.3
 

diff --git a/sources b/sources
index adee43c..2a2a9a3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (plasma-nm-6.7.3.tar.xz) = 81964fd7643ad3647a8aff260dd6b32904e36fc4a62f75688138c9791be1d0fc1f319de1579cea5da9d3dcc58bdb44bf95d2f247c2a0d5852ece004846050fe8
-SHA512 (plasma-nm-6.7.3.tar.xz.sig) = 3014bd2165e39c1c4f978756fd3f553c1a7d6d834379c123d8f0634d94610f9282884707cc346f10e76511a5a06d8a549b14734d3eeb80cc4a2d12ccd372dff4
+SHA512 (plasma-nm-6.7.5.tar.xz) = eacce5f85d519fe9a9beb89268aa0f080ca184b8f398445cad1a54f95ba0dc43ed017a42676e773dd3ad5abbad8a40cf160112f031b646657d6e63f8220a480a
+SHA512 (plasma-nm-6.7.5.tar.xz.sig) = 178f3de65fff958550ea32f9568326f1ea77440b36c1b5bb06e55a26af6049708e1cc0026e76caf577e52d06ad55eb90773a4664e397233fc86d743d2f0ead14

diff --git a/plasma-nm.spec b/plasma-nm.spec
index 8441404..cb2d9a3 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.5
-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.5-1.1
+- Drop sub-packages whose dependencies are not in epel10 yet
+  plasma-nm-{fortisslvpn,sstp}
+
 * Tue Sep 08 2026 Steve Cossette <farchord@gmail.com> - 6.7.5-1
 - 6.7.5
 

                 reply	other threads:[~2026-09-11 18:56 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178915299660.1.10458915064602268386.rpms-plasma-nm-34cd70362ead@fedoraproject.org \
    --to=tdawson@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox