[rpms/cool-retro-term] rawhide: Update to v2.0.0~beta2

[rpms/cool-retro-term] rawhide: Update to v2.0.0~beta2

[Artur Frenszek-Iwicki]

A new commit has been pushed.

Repo   : rpms/cool-retro-term
Branch : rawhide
Commit : a7d25e8b34c0e86881b966e52e4dbdc583b21a47
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date   : 2026-06-05T14:38:40+02:00
Stats  : +66/-20 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/cool-retro-term/c/a7d25e8b34c0e86881b966e52e4dbdc583b21a47?branch=rawhide

Log:
Update to v2.0.0~beta2

---
diff --git a/.gitignore b/.gitignore
index d77a128..a0204e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /cool-retro-term-1.1.0.tar.gz
 /cool-retro-term-1.1.1.tar.gz
 /cool-retro-term-1.2.0.tar.gz
+/cool-retro-term-2.0.0-beta2.tar.gz

diff --git a/0000-unbundle-kdsingleapplication.patch b/0000-unbundle-kdsingleapplication.patch
new file mode 100644
index 0000000..4d67a07
--- /dev/null
+++ b/0000-unbundle-kdsingleapplication.patch
@@ -0,0 +1,38 @@
+diff -rU4 cool-retro-term-2.0.0-beta2--orig/app/app.pro cool-retro-term-2.0.0-beta2/app/app.pro
+--- cool-retro-term-2.0.0-beta2--orig/app/app.pro	2026-05-31 12:04:28.000000000 +0200
++++ cool-retro-term-2.0.0-beta2/app/app.pro	2026-06-05 13:38:51.803821474 +0200
+@@ -2,19 +2,9 @@
+ TARGET = cool-retro-term
+ APP_VERSION = $$system(git -C $$PWD/.. describe --tags --always --dirty=-dirty)
+ isEmpty(APP_VERSION): APP_VERSION = "unknown"
+ DEFINES += APP_VERSION=\\\"$$APP_VERSION\\\"
+-
+-# TODO: When migrating to CMake, use KDSingleApplication's CMakeLists.txt instead of these manual sources.
+-INCLUDEPATH += $$PWD/../KDSingleApplication/src
+-HEADERS += \
+-    $$PWD/../KDSingleApplication/src/kdsingleapplication.h \
+-    $$PWD/../KDSingleApplication/src/kdsingleapplication_lib.h \
+-    $$PWD/../KDSingleApplication/src/kdsingleapplication_localsocket_p.h
+-SOURCES += \
+-    $$PWD/../KDSingleApplication/src/kdsingleapplication.cpp \
+-    $$PWD/../KDSingleApplication/src/kdsingleapplication_localsocket.cpp
+-DEFINES += KDSINGLEAPPLICATION_STATIC_BUILD
++LIBS += -lkdsingleapplication-qt6
+ 
+ DESTDIR = $$OUT_PWD/../
+ 
+ HEADERS += \
+diff -rU4 cool-retro-term-2.0.0-beta2--orig/app/main.cpp cool-retro-term-2.0.0-beta2/app/main.cpp
+--- cool-retro-term-2.0.0-beta2--orig/app/main.cpp	2026-05-31 12:04:28.000000000 +0200
++++ cool-retro-term-2.0.0-beta2/app/main.cpp	2026-06-05 13:31:16.226217938 +0200
+@@ -10,9 +10,9 @@
+ #include <QIcon>
+ #include <QQuickStyle>
+ #include <QtQml/qqml.h>
+ 
+-#include <kdsingleapplication.h>
++#include <kdsingleapplication-qt6/kdsingleapplication.h>
+ 
+ #include <QDebug>
+ #include <stdlib.h>
+ 

diff --git a/cool-retro-term.spec b/cool-retro-term.spec
index 2d0d118..bae51b0 100644
--- a/cool-retro-term.spec
+++ b/cool-retro-term.spec
@@ -1,32 +1,36 @@
 Name:    cool-retro-term
 Summary: Terminal emulator mimicking a CRT display
-# Automatically converted from old format: GPLv3+ - review is highly recommended.
 License: GPL-3.0-or-later
 
-Version: 1.2.0
-Release: 12%{?dist}
+Version: 2.0.0~beta2
+Release: 1%{?dist}
+
+%global git_tag %(echo "%{version}" | tr '~' '-')
 
 URL: https://github.com/Swordfish90/%{name}
-Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0: %{URL}/archive/%{git_tag}/%{name}-%{git_tag}.tar.gz
+
+# Build against system-provided KDSingleApplication
+Patch0: 0000-unbundle-kdsingleapplication.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: libappstream-glib
 BuildRequires: make
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtdeclarative-devel
-BuildRequires: qt5-qtquickcontrols2-devel
+BuildRequires: kdsingleapplication-qt6-devel >= 1.2.0
+BuildRequires: qt6-qtbase-devel
+BuildRequires: qt6-qtdeclarative-devel
+BuildRequires: qt6-qtquickcontrols2-devel
 
 Requires: hicolor-icon-theme
-Requires: qt5-qtbase
-Requires: qt5-qtbase-gui
-Requires: qt5-qtgraphicaleffects
-Requires: qt5-qtdeclarative
-Requires: qt5-qtquickcontrols
-Requires: qt5-qtquickcontrols2
-
-# Version requirement includes a release number as well,
-# since we want a fresher git snapshot, not the original v0.2.0
-%global qtw_version 0.2.0-9.20220109git6322802
+Requires: qt6-qtbase
+Requires: qt6-qtbase-gui
+Requires: qt6-qtgraphicaleffects
+Requires: qt6-qtdeclarative
+Requires: qt6-qtquickcontrols
+Requires: qt6-qtquickcontrols2
+
+# We want a fresher git snapshot, not the original v0.2.0
+%global qtw_version 0.2.0^20260531
 BuildRequires: qmltermwidget >= %{qtw_version}
 Requires: qmltermwidget >= %{qtw_version}
 
@@ -38,7 +42,7 @@ customizable, and reasonably lightweight.
 
 
 %prep
-%setup -q
+%autosetup -p1 -n %{name}-%{git_tag}
 
 # qmltermwidget is included in the project via a git submodule.
 # Since we serve it as a separate package, we modify
@@ -48,7 +52,7 @@ sed -e "s/SUBDIRS += qmltermwidget//" -i %{name}.pro
 
 
 %build
-%qmake_qt5 CONFIG+=force_debug_info
+%qmake_qt6 CONFIG+=force_debug_info
 make %{?_smp_mflags}
 
 
@@ -81,6 +85,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.a
 
 
 %changelog
+* Fri Jun 05 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 2.0.0~beta2-1
+- Update to v2.0.0~beta2
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index b69fcd8..a95f2a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cool-retro-term-1.2.0.tar.gz) = 21d3551d429380b026f8003652d78d186e5ac7079d3f143fe7f8f0c57876df263e5c40f218577ef236da859e779699f766414949591ecab38921caec5fd59209
+SHA512 (cool-retro-term-2.0.0-beta2.tar.gz) = d776c2570631c390a7c765fee893c6f112652bc9bae5c6eb7c4c824b2ef737220a9830521f0eec97950c36523e1b8d2d636b11afcdbf50cd294737d624c5b3b9