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

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


commit 88187c7924503e67a10f8a21fc64a907ba3ae897
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Fri Mar 15 16:48:13 2024 +0100

    Revert "- 24.01.95"
    
    This reverts commit 63f5e447da1d883431f9a384eb026650a1f5e68a.

 ka5-libksane.spec | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)
---
diff --git a/ka5-libksane.spec b/ka5-libksane.spec
index d02cb43..a487868 100644
--- a/ka5-libksane.spec
+++ b/ka5-libksane.spec
@@ -1,32 +1,32 @@
 #
 # 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		libksane
 Summary:	libksane
 Name:		ka5-%{kaname}
-Version:	24.01.95
-Release:	0.1
+Version:	23.08.4
+Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
-Source0:	https://download.kde.org/unstable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	c337666894b7f17f690156a96e2584b2
+Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
+# Source0-md5:	81ce0fdd18f281b05a7833ddd23444de
 URL:		http://www.kde.org/
-BuildRequires:	Qt6Core-devel
-BuildRequires:	Qt6Gui-devel >= 5.12.3
-BuildRequires:	Qt6Test-devel
-BuildRequires:	Qt6Widgets-devel
+BuildRequires:	Qt5Core-devel
+BuildRequires:	Qt5Gui-devel >= 5.12.3
+BuildRequires:	Qt5Test-devel
+BuildRequires:	Qt5Widgets-devel
 BuildRequires:	gettext-devel
 BuildRequires:	ka5-ksanecore-devel >= %{kdeappsver}
-BuildRequires:	kf6-extra-cmake-modules >= %{kframever}
-BuildRequires:	kf6-ki18n-devel >= %{kframever}
-BuildRequires:	kf6-ktextwidgets-devel >= %{kframever}
-BuildRequires:	kf6-kwallet-devel >= %{kframever}
-BuildRequires:	kf6-kwidgetsaddons-devel >= %{kframever}
+BuildRequires:	kf5-extra-cmake-modules >= %{kframever}
+BuildRequires:	kf5-ki18n-devel >= %{kframever}
+BuildRequires:	kf5-ktextwidgets-devel >= %{kframever}
+BuildRequires:	kf5-kwallet-devel >= %{kframever}
+BuildRequires:	kf5-kwidgetsaddons-devel >= %{kframever}
 BuildRequires:	ninja
-BuildRequires:	qt6-build >= %{qtver}
+BuildRequires:	qt5-build >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	sane-backends-devel
 BuildRequires:	shared-mime-info
@@ -62,8 +62,7 @@ Pliki nagłówkowe dla programistów używających %{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}
@@ -90,12 +89,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kaname}.lang
 %defattr(644,root,root,755)
-%{_iconsdir}/hicolor/*x*/actions/*.png
-%attr(755,root,root) %{_libdir}/libKSaneWidgets6.so.*.*
-%ghost %{_libdir}/libKSaneWidgets6.so.6
+%attr(755,root,root) %{_libdir}/libKF5Sane.so.*.*.*
+%ghost %{_libdir}/libKF5Sane.so.5
+%{_iconsdir}/hicolor/16x16/actions/black-white.png
+%{_iconsdir}/hicolor/16x16/actions/color.png
+%{_iconsdir}/hicolor/16x16/actions/gray-scale.png
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/KSaneWidgets6
-%{_libdir}/cmake/KSaneWidgets6
-%{_libdir}/libKSaneWidgets6.so
+%{_includedir}/KF5/KSane
+%{_libdir}/cmake/KF5Sane
+%{_libdir}/libKF5Sane.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-libksane.git/commitdiff/88187c7924503e67a10f8a21fc64a907ba3ae897



More information about the pld-cvs-commit mailing list