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

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


commit 5a1689ef8e9a9cdd5669a084bb0770e3ea2638f6
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Fri Mar 15 16:32:01 2024 +0100

    Revert "- 24.01.95"
    
    This reverts commit eda6719cc8af1d38a1eddb1900ba2014528fb295.

 ka5-kgeography.spec | 47 ++++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 21 deletions(-)
---
diff --git a/ka5-kgeography.spec b/ka5-kgeography.spec
index f95a9e1..9f68c6c 100644
--- a/ka5-kgeography.spec
+++ b/ka5-kgeography.spec
@@ -1,35 +1,35 @@
 #
 # 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		kgeography
 Summary:	kgeography
 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
-Source0:	https://download.kde.org/unstable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	0e627e07e1e6b12c51fe97ee4f8ec282
+Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
+# Source0-md5:	31dd406cecbb9a73e143255ec2d9b6ce
 URL:		http://www.kde.org/
-BuildRequires:	Qt6Core-devel >= %{qtver}
-BuildRequires:	Qt6Gui-devel >= 5.11.1
-BuildRequires:	Qt6Widgets-devel
+BuildRequires:	Qt5Core-devel >= %{qtver}
+BuildRequires:	Qt5Gui-devel >= 5.11.1
+BuildRequires:	Qt5Widgets-devel
 BuildRequires:	cmake >= 3.20
 BuildRequires:	gettext-devel
-BuildRequires:	kf6-kconfigwidgets-devel >= %{kframever}
-BuildRequires:	kf6-kcoreaddons-devel >= %{kframever}
-BuildRequires:	kf6-kcrash-devel >= %{kframever}
-BuildRequires:	kf6-kdoctools-devel >= %{kframever}
-BuildRequires:	kf6-ki18n-devel >= %{kframever}
-BuildRequires:	kf6-kiconthemes-devel >= %{kframever}
-BuildRequires:	kf6-kitemviews-devel >= %{kframever}
-BuildRequires:	kf6-kwidgetsaddons-devel >= %{kframever}
-BuildRequires:	kf6-kxmlgui-devel >= %{kframever}
+BuildRequires:	kf5-kconfigwidgets-devel >= %{kframever}
+BuildRequires:	kf5-kcoreaddons-devel >= %{kframever}
+BuildRequires:	kf5-kcrash-devel >= %{kframever}
+BuildRequires:	kf5-kdoctools-devel >= %{kframever}
+BuildRequires:	kf5-ki18n-devel >= %{kframever}
+BuildRequires:	kf5-kiconthemes-devel >= %{kframever}
+BuildRequires:	kf5-kitemviews-devel >= %{kframever}
+BuildRequires:	kf5-kwidgetsaddons-devel >= %{kframever}
+BuildRequires:	kf5-kxmlgui-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
@@ -67,8 +67,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}
@@ -93,9 +92,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_desktopdir}/org.kde.kgeography.desktop
 %{_datadir}/config.kcfg/kgeography.kcfg
-%{_iconsdir}/hicolor/*x*/apps/*.png
+%{_iconsdir}/hicolor/128x128/apps/kgeography.png
+%{_iconsdir}/hicolor/16x16/apps/kgeography.png
+%{_iconsdir}/hicolor/22x22/apps/kgeography.png
+%{_iconsdir}/hicolor/32x32/apps/kgeography.png
+%{_iconsdir}/hicolor/48x48/apps/kgeography.png
+%{_iconsdir}/hicolor/64x64/apps/kgeography.png
 %{_iconsdir}/hicolor/scalable/apps/kgeography.svgz
 %{_datadir}/kgeography
+%{_datadir}/kxmlgui5/kgeography
 #%{_localedir}/fi/LC_SCRIPTS/kgeography/kgeography.js
 #%{_localedir}/fi/LC_SCRIPTS/kgeography/kgeography.pmap
 #%{_localedir}/fi/LC_SCRIPTS/kgeography/kgeography.pmapc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-kgeography.git/commitdiff/5a1689ef8e9a9cdd5669a084bb0770e3ea2638f6



More information about the pld-cvs-commit mailing list