Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kstars for openSUSE:Factory checked
in at 2025-06-06 22:43:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kstars (Old)
and /work/SRC/openSUSE:Factory/.kstars.new.19631 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kstars"
Fri Jun 6 22:43:50 2025 rev:147 rq:1283568 version:3.7.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/kstars/kstars.changes 2025-04-02
17:15:14.262066734 +0200
+++ /work/SRC/openSUSE:Factory/.kstars.new.19631/kstars.changes 2025-06-06
22:44:30.020393209 +0200
@@ -1,0 +2,9 @@
+Wed Jun 4 10:55:12 UTC 2025 - Christophe Marin <christo...@krop.fr>
+
+- Update to 3.7.7. Check the ChangeLog file for the full list of
+ changes.
+- Start using Qt 6 to build kstars
+- Add patch:
+ * 0001-Fix-installation-with-Qt6.patch
+
+-------------------------------------------------------------------
Old:
----
_service
kstars-3.7.6.tar.xz
New:
----
0001-Fix-installation-with-Qt6.patch
kstars-3.7.7.tar.xz
kstars-3.7.7.tar.xz.sig
kstars.keyring
BETA DEBUG BEGIN:
New:- Add patch:
* 0001-Fix-installation-with-Qt6.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kstars.spec ++++++
--- /var/tmp/diff_new_pack.fEQ2qp/_old 2025-06-06 22:44:32.452494002 +0200
+++ /var/tmp/diff_new_pack.fEQ2qp/_new 2025-06-06 22:44:32.456494168 +0200
@@ -16,14 +16,11 @@
#
-%if 0%{?suse_version} && 0%{?suse_version} < 1590
-%global force_gcc_version 12
-%endif
-
+%bcond_without released
# Internal QML import
%global __requires_exclude qmlimport\\((KStarsLiteEnums|TelescopeLiteEnums).*
Name: kstars
-Version: 3.7.6
+Version: 3.7.7
Release: 0
Summary: Desktop Planetarium
# Note for legal: the Apache licensed files in the tarball are for the
@@ -32,51 +29,60 @@
# used nor installed
License: GPL-2.0-or-later AND GPL-3.0-or-later
Group: Productivity/Scientific/Astronomy
-URL: https://edu.kde.org/kstars/
-# For whatever reason, they aren't uploading releases anymore on DKO, so we
use the one from gitlab instead.
-Source0: %{name}-%{version}.tar.xz
+URL: https://kstars.kde.org
+Source0:
https://download.kde.org/stable/kstars/%{version}/kstars-%{version}.tar.xz
+%if %{with released}
+Source1:
https://download.kde.org/stable/kstars/%{version}/kstars-%{version}.tar.xz.sig
+#
https://invent.kde.org/sysadmin/release-keyring/-/blob/master/keys/mutla...@key1.asc?ref_type=heads
+Source2: kstars.keyring
+%endif
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-Fix-installation-with-Qt6.patch
BuildRequires: Mesa-devel
BuildRequires: curl-devel
-BuildRequires: extra-cmake-modules
+BuildRequires: kf6-extra-cmake-modules
BuildRequires: fdupes
-BuildRequires: gcc%{?force_gcc_version}-c++ >= 12
BuildRequires: libXISF-devel
BuildRequires: libnova-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: xplanet
-BuildRequires: cmake(KF5Config)
-BuildRequires: cmake(KF5Crash)
-BuildRequires: cmake(KF5DocTools)
-BuildRequires: cmake(KF5I18n)
-BuildRequires: cmake(KF5KIO)
-BuildRequires: cmake(KF5NewStuff)
-BuildRequires: cmake(KF5Notifications)
-BuildRequires: cmake(KF5NotifyConfig)
-BuildRequires: cmake(KF5Plotting)
-BuildRequires: cmake(KF5WidgetsAddons)
-BuildRequires: cmake(KF5XmlGui)
-BuildRequires: cmake(Qt5Concurrent)
-BuildRequires: cmake(Qt5DataVisualization)
-BuildRequires: cmake(Qt5Gui)
-BuildRequires: cmake(Qt5Keychain)
-BuildRequires: cmake(Qt5Network)
-BuildRequires: cmake(Qt5PrintSupport)
-BuildRequires: cmake(Qt5Qml)
-BuildRequires: cmake(Qt5Quick)
-BuildRequires: cmake(Qt5Sql)
-BuildRequires: cmake(Qt5Svg)
-BuildRequires: cmake(Qt5Test)
-BuildRequires: cmake(Qt5WebSockets)
-BuildRequires: cmake(Qt5Xml)
-BuildRequires: cmake(StellarSolver) >= 2.2
+BuildRequires: cmake(KF6Config)
+BuildRequires: cmake(KF6Crash)
+BuildRequires: cmake(KF6DocTools)
+BuildRequires: cmake(KF6I18n)
+BuildRequires: cmake(KF6KIO)
+BuildRequires: cmake(KF6NewStuff)
+BuildRequires: cmake(KF6Notifications)
+BuildRequires: cmake(KF6NotifyConfig)
+BuildRequires: cmake(KF6Plotting)
+BuildRequires: cmake(KF6WidgetsAddons)
+BuildRequires: cmake(KF6XmlGui)
+BuildRequires: cmake(Qt6Concurrent)
+BuildRequires: cmake(Qt6DataVisualization)
+BuildRequires: cmake(Qt6DBus)
+BuildRequires: cmake(Qt6Gui)
+BuildRequires: cmake(Qt6Keychain)
+BuildRequires: cmake(Qt6Network)
+BuildRequires: cmake(Qt6PrintSupport)
+BuildRequires: cmake(Qt6Qml)
+BuildRequires: cmake(Qt6Quick)
+BuildRequires: cmake(Qt6Sql)
+BuildRequires: cmake(Qt6Svg)
+BuildRequires: cmake(Qt6SvgWidgets)
+BuildRequires: cmake(Qt6WebSockets)
+BuildRequires: cmake(Qt6Xml)
+# the library was renamed in 2.7, better require (at least) this version
+BuildRequires: cmake(StellarSolver) >= 2.7
BuildRequires: pkgconfig(cfitsio)
BuildRequires: pkgconfig(eigen3)
BuildRequires: pkgconfig(gsl)
BuildRequires: pkgconfig(libindi) >= 2.0.0
BuildRequires: pkgconfig(libraw)
BuildRequires: pkgconfig(wcslib)
-Requires: libqt5-qtquickcontrols
+Requires: qt6-sql-sqlite
+Requires: qt6-declarative-imports
+Requires: qt6-positioning-imports
Recommends: /usr/bin/dbus-send
%if 0%{?suse_version} > 1500
Recommends: indi
@@ -94,47 +100,38 @@
%prep
%autosetup -p1
# remove Catalan docs due to
https://invent.kde.org/education/kstars/-/issues/186
-%if %{pkg_vcmp cmake(KF5DocTools) < 5.92}
+%if %{pkg_vcmp cmake(KF6DocTools) < 5.92}
rm -r po/ca/docs po/ca@valencia/docs
%endif
-# remove FR docs due to https://bugs.kde.org/show_bug.cgi?id=459821
-rm -r po/fr/docs
-
%build
-%ifarch ppc ppc64
-export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
-%endif
-%if 0%{?force_gcc_version}
-export CC="gcc-%{?force_gcc_version}"
-export CXX="g++-%{?force_gcc_version}"
-%endif
-%cmake_kf5 -d build
-%cmake_build
+%cmake_kf6 \
+ -DBUILD_WITH_QT6:BOOL=TRUE \
+ -DBUILD_QT5:BOOL=FALSE
+
+%kf6_build
%install
-%kf5_makeinstall -C build
+%kf6_install
-%find_lang %{name} --with-man --all-name
-%{kf5_find_htmldocs}
+%find_lang %{name} --with-man --all-name --with-html
# Remove static library
-rm %{buildroot}%{_kf5_libdir}/libhtmesh.a
+rm %{buildroot}%{_kf6_libdir}/libhtmesh.a
-%fdupes -s %{buildroot}
+%fdupes %{buildroot}
%files
%license LICENSES/GPL-2.0-or-later.txt LICENSES/GPL-3.0-or-later.txt
%doc AUTHORS ChangeLog README.md README.customize README.ephemerides
README.images
-%doc %{_kf5_htmldir}/en/kstars/
%{_datadir}/sounds/*.ogg
-%{_kf5_applicationsdir}/org.kde.kstars.desktop
-%{_kf5_appsdir}/kstars/
-%{_kf5_appstreamdir}/org.kde.kstars.appdata.xml
-%{_kf5_bindir}/kstars
-%{_kf5_configkcfgdir}/kstars.kcfg
-%{_kf5_iconsdir}/hicolor/*/*/*
-%{_kf5_notifydir}/kstars.notifyrc
+%{_kf6_applicationsdir}/org.kde.kstars.desktop
+%{_kf6_appsdir}/kstars/
+%{_kf6_appstreamdir}/org.kde.kstars.appdata.xml
+%{_kf6_bindir}/kstars
+%{_kf6_configkcfgdir}/kstars.kcfg
+%{_kf6_iconsdir}/hicolor/*/*/*
+%{_kf6_notificationsdir}/kstars.notifyrc
%files lang -f %{name}.lang
%license LICENSES/GPL-2.0-or-later.txt LICENSES/GPL-3.0-or-later.txt
++++++ 0001-Fix-installation-with-Qt6.patch ++++++
>From 279bac06da6fc5c0d424ef320792739ea580bfcf Mon Sep 17 00:00:00 2001
From: Christophe Marin <christo...@krop.fr>
Date: Wed, 4 Jun 2025 14:27:47 +0200
Subject: [PATCH] Fix installation with Qt6
---
kstars/data/fr/CMakeLists.txt | 2 +-
kstars/data/nds/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kstars/data/fr/CMakeLists.txt b/kstars/data/fr/CMakeLists.txt
index 0702974..c621201 100644
--- a/kstars/data/fr/CMakeLists.txt
+++ b/kstars/data/fr/CMakeLists.txt
@@ -1,5 +1,5 @@
########### install files ###############
-install( FILES info_url.dat DESTINATION ${DATA_INSTALL_DIR}/kstars/fr
+install( FILES info_url.dat DESTINATION ${KSTARS_DATADIR}/kstars/fr
)
diff --git a/kstars/data/nds/CMakeLists.txt b/kstars/data/nds/CMakeLists.txt
index ba15f6c..f977b1d 100644
--- a/kstars/data/nds/CMakeLists.txt
+++ b/kstars/data/nds/CMakeLists.txt
@@ -1,5 +1,5 @@
########### install files ###############
-install( FILES info_url.dat DESTINATION ${DATA_INSTALL_DIR}/kstars/nds
+install( FILES info_url.dat DESTINATION ${KSTARS_DATADIR}/kstars/nds
)
--
2.49.0
++++++ kstars-3.7.6.tar.xz -> kstars-3.7.7.tar.xz ++++++
/work/SRC/openSUSE:Factory/kstars/kstars-3.7.6.tar.xz
/work/SRC/openSUSE:Factory/.kstars.new.19631/kstars-3.7.7.tar.xz differ: char
15, line 1
