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

witekfl witekfl at pld-linux.org
Fri Mar 15 17:37:23 CET 2024


commit ed04d3134e81dd1c47464efb3053a3eb01d21cae
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Fri Mar 15 16:38:45 2024 +0100

    Revert "- 24.01.95"
    
    This reverts commit e15f4cc8943a745ba60b8c91e85ae8de57436548.

 ka5-kolourpaint.spec | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/ka5-kolourpaint.spec b/ka5-kolourpaint.spec
index abf9ea7..504612a 100644
--- a/ka5-kolourpaint.spec
+++ b/ka5-kolourpaint.spec
@@ -1,37 +1,38 @@
 #
 # 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		kolourpaint
 Summary:	kolourpaint
 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:	a90b4cebab85d7b925091e63337928c9
+Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
+# Source0-md5:	fdbe5457a4dbd3098b57fc4f853dc44b
 URL:		http://www.kde.org/
-BuildRequires:	Qt6Core-devel >= %{qtver}
-BuildRequires:	Qt6Gui-devel >= 5.11.1
-BuildRequires:	Qt6PrintSupport-devel
-BuildRequires:	Qt6Widgets-devel
+BuildRequires:	Qt5Core-devel >= %{qtver}
+BuildRequires:	Qt5Gui-devel >= 5.11.1
+BuildRequires:	Qt5PrintSupport-devel
+BuildRequires:	Qt5Widgets-devel
 BuildRequires:	cmake >= 3.20
 BuildRequires:	gettext-devel
 BuildRequires:	ka5-libksane-devel >= %{kdeappsver}
-BuildRequires:	kf6-extra-cmake-modules >= %{kframever}
-BuildRequires:	kf6-kdoctools-devel >= %{kframever}
-BuildRequires:	kf6-kguiaddons-devel >= %{kframever}
-BuildRequires:	kf6-ki18n-devel >= %{kframever}
-BuildRequires:	kf6-kiconthemes-devel >= %{kframever}
-BuildRequires:	kf6-kio-devel >= %{kframever}
-BuildRequires:	kf6-ktextwidgets-devel >= %{kframever}
-BuildRequires:	kf6-kwidgetsaddons-devel >= %{kframever}
-BuildRequires:	kf6-kxmlgui-devel >= %{kframever}
+BuildRequires:	kf5-extra-cmake-modules >= %{kframever}
+BuildRequires:	kf5-kdelibs4support-devel >= %{kframever}
+BuildRequires:	kf5-kdoctools-devel >= %{kframever}
+BuildRequires:	kf5-kguiaddons-devel >= %{kframever}
+BuildRequires:	kf5-ki18n-devel >= %{kframever}
+BuildRequires:	kf5-kiconthemes-devel >= %{kframever}
+BuildRequires:	kf5-kio-devel >= %{kframever}
+BuildRequires:	kf5-ktextwidgets-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
@@ -63,8 +64,7 @@ prostokątów, zaokrąglonych prostokątów, owali i wieloboków.
 	-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}
@@ -90,7 +90,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libkolourpaint_lgpl.so
 %attr(755,root,root) %{_libdir}/libkolourpaint_lgpl.so.5
 %{_desktopdir}/org.kde.kolourpaint.desktop
-%{_iconsdir}/hicolor/*x*/apps/kolourpaint.png
+%{_iconsdir}/hicolor/16x16/apps/kolourpaint.png
+%{_iconsdir}/hicolor/22x22/apps/kolourpaint.png
+%{_iconsdir}/hicolor/32x32/apps/kolourpaint.png
+%{_iconsdir}/hicolor/48x48/apps/kolourpaint.png
 %{_iconsdir}/hicolor/scalable/apps/kolourpaint.svgz
 %{_datadir}/kolourpaint
+%{_datadir}/kxmlgui5/kolourpaint
 %{_datadir}/metainfo/org.kde.kolourpaint.appdata.xml
+%{_iconsdir}/hicolor/128x128/apps/kolourpaint.png
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-kolourpaint.git/commitdiff/ed04d3134e81dd1c47464efb3053a3eb01d21cae



More information about the pld-cvs-commit mailing list