[rpms/kig] epel10: 24.01.85

[rpms/kig] epel10: 24.01.85

[Alessandro Astone]

A new commit has been pushed.

Repo   : rpms/kig
Branch : epel10
Commit : bfb260627d5e9a4da10ff0f2afd5099d85fe19e8
Author : Alessandro Astone <ales.astone@gmail.com>
Date   : 2024-01-07T18:16:44+01:00
Stats  : +10/-76 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/kig/c/bfb260627d5e9a4da10ff0f2afd5099d85fe19e8?branch=epel10

Log:
24.01.85

---
diff --git a/.gitignore b/.gitignore
index d5e6c65..2a787b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@
 /kig-23.08.0.tar.xz
 /kig-23.08.1.tar.xz
 /kig-23.08.2.tar.xz
+/kig-24.01.85.tar.xz

diff --git a/kig-23.04.1-kde#469962-rh#2209374.patch b/kig-23.04.1-kde#469962-rh#2209374.patch
deleted file mode 100644
index bae1bd5..0000000
--- a/kig-23.04.1-kde#469962-rh#2209374.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bca478c18b1a64f96c63cbe87111c79155bf7eb5 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 18 May 2023 21:06:42 +0200
-Subject: [PATCH] Fix loading kig part
-
-c1f566d4790c33055fa42b60ae2b00728ba1a271 changed the part to embed JSON metadata
-
-That doesn't work with the legacy KService-based part loading, so use the proper way
-
-BUG: 469962
-(cherry picked from commit 8cabd8421629520ce4e7f0060684c01982ff45fe)
----
- kig/kig.cpp | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/kig/kig.cpp b/kig/kig.cpp
-index 8d686909..0f79e3c9 100644
---- a/kig/kig.cpp
-+++ b/kig/kig.cpp
-@@ -21,8 +21,8 @@
- #include <KEditToolBar>
- #include <KLocalizedString>
- #include <KMessageBox>
-+#include <KPluginFactory>
- #include <KRecentFilesAction>
--#include <KService>
- #include <KSharedConfig>
- #include <KStandardAction>
- #include <KTipDialog>
-@@ -33,8 +33,6 @@ Kig::Kig()
-     : KParts::MainWindow()
-     , m_part(nullptr)
- {
--    KService::Ptr kigpartService = KService::serviceByDesktopName(QStringLiteral("kig_part"));
--
-     setObjectName(QStringLiteral("Kig"));
-     // setting the configuration file
-     config = new KConfig(QStringLiteral("kigrc"));
-@@ -43,9 +41,12 @@ Kig::Kig()
-     // then, setup our actions
-     setupActions();
- 
--    if (kigpartService) {
--        m_part = kigpartService->createInstance<KParts::ReadWritePart>(this);
--        m_mimeTypes = kigpartService->mimeTypes();
-+    const KPluginMetaData partMetaData(QLatin1String("kf") + QT_STRINGIFY(QT_VERSION_MAJOR) + QLatin1String("/parts/kigpart"));
-+    const auto result = KPluginFactory::instantiatePlugin<KParts::ReadWritePart>(partMetaData, this);
-+
-+    if (result) {
-+        m_part = result.plugin;
-+        m_mimeTypes = partMetaData.mimeTypes();
-         if (m_part) {
-             // tell the KParts::MainWindow that this is indeed the main widget
-             setCentralWidget(m_part->widget());
--- 
-GitLab
-

diff --git a/kig.spec b/kig.spec
index 8142355..10e4380 100644
--- a/kig.spec
+++ b/kig.spec
@@ -3,19 +3,13 @@
 
 Name:    kig
 Summary: Interactive Geometry 
-Version: 23.08.2
+Version: 24.01.85
 Release: 1%{?dist}
 
-License: GPLv2+
+License: BSD-3-Clause AND GFDL-1.2-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.1-or-later
 URL:     https://invent.kde.org/education/%{name}
 
-%global revision %(echo %{version} | cut -d. -f3)
-%if %{revision} >= 50
-%global stable unstable
-%else
-%global stable stable
-%endif
-Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable_kf5}/release-service/%{version}/src/%{name}-%{version}.tar.xz
 
 ## upstreamable patches
 # https://bugzilla.redhat.com/show_bug.cgi?id=1238113
@@ -62,11 +56,9 @@ Conflicts: kdeedu-math < 4.7.0-10
 
 
 %prep
-%setup  -q
+%autosetup -p1
 
-%patch1 -p1 -b .0001
-
-sed -ie "s|^#!/usr/bin/env python3$|#!%{__python3}|" pykig/pykig.py
+%py3_shebang_fix pykig/pykig.py
 
 
 %build
@@ -99,22 +91,20 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.d
 %license LICENSES/*
 %{_kf5_bindir}/%{name}*
 %{_kf5_bindir}/pykig.*
-#{_sysconfdir}/xdg/%{name}.knsrc
 %{_kf5_datadir}/applications/org.kde.%{name}.desktop
 %{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
 %{_kf5_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_kf5_datadir}/icons/hicolor/*/mimetypes/application-x-%{name}.*
 %{_kf5_datadir}/%{name}/
-#{_kf5_datadir}/kconf_update/%{name}*
-#{_kf5_datadir}/knotifications5/%{name}.notifyrc
-%{_kf5_datadir}/kxmlgui5/%{name}/
-#{_kf5_datadir}/sounds/%{name}*
 %{_kf5_plugindir}/parts/kigpart.so
 %{_kf5_datadir}/katepart5/syntax/python-kig.xml
 %{_mandir}/man1/kig.1*
 
 
 %changelog
+* Sun Jan 07 2024 Alessandro Astone <ales.astone@gmail.com> - 24.01.85-1
+- 24.01.85
+
 * Thu Oct 12 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.08.2-1
 - 23.08.2
 

diff --git a/sources b/sources
index ec2eca3..f84be52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kig-23.08.2.tar.xz) = 9d6ca9be4d7550a41e7dc6563688246050961a87b50dd35491a40c91b6954e79b72934fc0214b7a87cc9e31dad88ae2c54d3b356b33632c2b3ff225340e2e9dd
+SHA512 (kig-24.01.85.tar.xz) = e087a1241631b0e6826281ae5744c35e041818dc274eaba0933fc779da2206a4273ee9eecbcfdbece102d361df33405bf7b7d913ca59758d3feb79eb51fdeb6a