[packages/ka5-kanagram] Revert "- 24.01.95"

witekfl witekfl at pld-linux.org
Fri Mar 15 17:33:40 CET 2024


commit 76f4ded7c8cd36c8b5611e54b6ab7b70650242a0
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Fri Mar 15 16:24:01 2024 +0100

    Revert "- 24.01.95"
    
    This reverts commit fb7e5a39f8e996e269c09f1eac281d2e6a1d2df5.

 ka5-kanagram.spec | 55 +++++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/ka5-kanagram.spec b/ka5-kanagram.spec
index 982c294..50f1604 100644
--- a/ka5-kanagram.spec
+++ b/ka5-kanagram.spec
@@ -1,48 +1,48 @@
 #
 # Conditional build:
 %bcond_with	tests		# build with tests
-%define		kdeappsver	24.01.95
+%define		kdeappsver	23.08.4
 %define		kframever	5.94.0
 %define		qtver		5.15.2
 %define		kaname		kanagram
 Summary:	kanagram
 Name:		ka5-%{kaname}
-Version:	24.01.95
-Release:	0.1
+Version:	23.08.4
+Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Applications/Games
-Source0:	https://download.kde.org/unstable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	cc460985f6ecd74f25b42e57d02ecc36
+Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
+# Source0-md5:	4fa1c5c09b6d790bbefff676a523f3bb
 URL:		http://www.kde.org/
-BuildRequires:	Qt6Core-devel >= %{qtver}
-BuildRequires:	Qt6Gui-devel >= 5.11.1
-BuildRequires:	Qt6Network-devel >= 5.11.1
-BuildRequires:	Qt6OpenGL-devel
-BuildRequires:	Qt6Qml-devel
-BuildRequires:	Qt6Quick-devel
-BuildRequires:	Qt6Widgets-devel >= 5.11.1
+BuildRequires:	Qt5Core-devel >= %{qtver}
+BuildRequires:	Qt5Gui-devel >= 5.11.1
+BuildRequires:	Qt5Network-devel >= 5.11.1
+BuildRequires:	Qt5OpenGL-devel
+BuildRequires:	Qt5Qml-devel
+BuildRequires:	Qt5Quick-devel
+BuildRequires:	Qt5Widgets-devel >= 5.11.1
 BuildRequires:	cmake >= 3.20
 BuildRequires:	gettext-devel
 BuildRequires:	ka5-libkeduvocdocument-devel >= %{version}
-BuildRequires:	kf6-extra-cmake-modules >= %{kframever}
-BuildRequires:	kf6-kconfig-devel >= %{kframever}
-BuildRequires:	kf6-kconfigwidgets-devel >= %{kframever}
-BuildRequires:	kf6-kcoreaddons-devel >= %{kframever}
-BuildRequires:	kf6-kcrash-devel >= %{kframever}
-BuildRequires:	kf6-kdeclarative-devel >= %{kframever}
-BuildRequires:	kf6-kdoctools-devel >= %{kframever}
-BuildRequires:	kf6-ki18n-devel >= %{kframever}
-BuildRequires:	kf6-kio-devel >= %{kframever}
-BuildRequires:	kf6-knewstuff-devel >= %{kframever}
-BuildRequires:	kf6-sonnet-devel >= %{kframever}
+BuildRequires:	kf5-extra-cmake-modules >= %{kframever}
+BuildRequires:	kf5-kconfig-devel >= %{kframever}
+BuildRequires:	kf5-kconfigwidgets-devel >= %{kframever}
+BuildRequires:	kf5-kcoreaddons-devel >= %{kframever}
+BuildRequires:	kf5-kcrash-devel >= %{kframever}
+BuildRequires:	kf5-kdeclarative-devel >= %{kframever}
+BuildRequires:	kf5-kdoctools-devel >= %{kframever}
+BuildRequires:	kf5-ki18n-devel >= %{kframever}
+BuildRequires:	kf5-kio-devel >= %{kframever}
+BuildRequires:	kf5-knewstuff-devel >= %{kframever}
+BuildRequires:	kf5-sonnet-devel >= %{kframever}
 BuildRequires:	ninja
-BuildRequires:	qt6-build >= %{qtver}
+BuildRequires:	qt5-build >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	shared-mime-info
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
+Requires:	Qt5MultimediaQuick
 Requires:	%{name}-data = %{version}-%{release}
-Requires:	Qt6MultimediaQuick
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -89,8 +89,7 @@ Dane dla %{kaname}.
 	-G Ninja \
 	%{!?with_tests:-DBUILD_TESTING=OFF} \
 	-DHTML_INSTALL_DIR=%{_kdedocdir} \
-	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-	-DQT_MAJOR_VERSION=6
+	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
 %ninja_build -C build
 
 %if %{with tests}
@@ -125,5 +124,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/80x80/apps/kanagram-harmattan.png
 %{_iconsdir}/hicolor/scalable/apps/kanagram.svgz
 %{_datadir}/kanagram
-%{_datadir}/knsrcfiles/kanagram.knsrc
 %{_datadir}/metainfo/org.kde.kanagram.appdata.xml
+%{_datadir}/knsrcfiles/kanagram.knsrc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-kanagram.git/commitdiff/76f4ded7c8cd36c8b5611e54b6ab7b70650242a0



More information about the pld-cvs-commit mailing list