[packages/ka6-pimcommon] - updated dependencies, release 3

qboosh qboosh at pld-linux.org
Thu Oct 31 22:09:25 CET 2024


commit 008d1fe3543d6e08a5642bb82df7cb22f1cbf22c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Oct 31 22:03:58 2024 +0100

    - updated dependencies, release 3

 ka6-pimcommon.spec | 120 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 75 insertions(+), 45 deletions(-)
---
diff --git a/ka6-pimcommon.spec b/ka6-pimcommon.spec
index f8a47a8..c0f6fcb 100644
--- a/ka6-pimcommon.spec
+++ b/ka6-pimcommon.spec
@@ -2,66 +2,90 @@
 # Conditional build:
 %bcond_with	tests	# test suite
 
-%define		kdeappsver	24.08.2
-%define		kframever	5.94.0
-%define		qtver		5.15.2
+%define		kdeappsver	%{version}
+# packages version, not cmake config version (which is 6.2.2)
+%define		ka_ver		%{version}
+%define		kf_ver		6.3.0
+%define		qt_ver		6.6.0
 %define		kaname		pimcommon
 Summary:	Common PIM libraries
 Summary(pl.UTF-8):	Wspólne biblioteki PIM
 Name:		ka6-%{kaname}
 Version:	24.08.2
-Release:	2
+Release:	3
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
 Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
 # Source0-md5:	56afaecf4985cde86874464c2d302d91
 URL:		https://kde.org/
-BuildRequires:	Qt6Core-devel >= %{qtver}
-BuildRequires:	Qt6DBus-devel
-BuildRequires:	Qt6Designer-devel
-BuildRequires:	Qt6Gui-devel
-BuildRequires:	Qt6Network-devel
-BuildRequires:	Qt6PrintSupport-devel
-BuildRequires:	Qt6Test-devel
-BuildRequires:	Qt6UiTools-devel >= 5.11.1
-BuildRequires:	Qt6Widgets-devel
-BuildRequires:	Qt6Xml-devel
+BuildRequires:	Qt6Core-devel >= %{qt_ver}
+BuildRequires:	Qt6DBus-devel >= %{qt_ver}
+BuildRequires:	Qt6Designer-devel >= %{qt_ver}
+BuildRequires:	Qt6Gui-devel >= %{qt_ver}
+BuildRequires:	Qt6Network-devel >= %{qt_ver}
+%if %{with tests}
+BuildRequires:	Qt6Test-devel >= %{qt_ver}
+%endif
+BuildRequires:	Qt6UiTools-devel >= %{qt_ver}
+BuildRequires:	Qt6Widgets-devel >= %{qt_ver}
+BuildRequires:	Qt6Xml-devel >= %{qt_ver}
 BuildRequires:	cmake >= 3.20
-BuildRequires:	gettext-devel
-BuildRequires:	grantlee-qt6-devel >= 5.1
-BuildRequires:	ka6-akonadi-contacts-devel >= %{kdeappsver}
-BuildRequires:	ka6-akonadi-devel >= %{kdeappsver}
-BuildRequires:	ka6-kimap-devel >= %{kdeappsver}
-BuildRequires:	ka6-kmime-devel >= %{kdeappsver}
-BuildRequires:	ka6-kpimtextedit-devel >= %{kdeappsver}
-BuildRequires:	ka6-libkdepim-devel >= %{kdeappsver}
-BuildRequires:	kf6-extra-cmake-modules >= %{kframever}
-BuildRequires:	kf6-karchive-devel >= %{kframever}
-BuildRequires:	kf6-kcodecs-devel >= %{kframever}
-BuildRequires:	kf6-kcompletion-devel >= %{kframever}
-BuildRequires:	kf6-kconfig-devel >= %{kframever}
-BuildRequires:	kf6-kconfigwidgets-devel >= %{kframever}
-BuildRequires:	kf6-kcontacts-devel >= %{kframever}
-BuildRequires:	kf6-kcoreaddons-devel >= %{kframever}
-BuildRequires:	kf6-kdbusaddons-devel >= %{kframever}
-BuildRequires:	kf6-ki18n-devel >= %{kframever}
-BuildRequires:	kf6-kiconthemes-devel >= %{kframever}
-BuildRequires:	kf6-kio-devel >= %{kframever}
-BuildRequires:	kf6-kitemmodels-devel >= %{kframever}
-BuildRequires:	kf6-kjobwidgets-devel >= %{kframever}
-BuildRequires:	kf6-knewstuff-devel >= %{kframever}
-BuildRequires:	kf6-kservice-devel >= %{kframever}
-BuildRequires:	kf6-ktextaddons-devel
-BuildRequires:	kf6-kwidgetsaddons-devel >= %{kframever}
-BuildRequires:	kf6-kxmlgui-devel >= %{kframever}
-BuildRequires:	kf6-purpose-devel >= %{kframever}
+BuildRequires:	gettext-tools
+BuildRequires:	ka6-akonadi-contacts-devel >= %{ka_ver}
+BuildRequires:	ka6-akonadi-devel >= %{ka_ver}
+BuildRequires:	ka6-kimap-devel >= %{ka_ver}
+BuildRequires:	ka6-kldap-devel >= %{ka_ver}
+BuildRequires:	ka6-libkdepim-devel >= %{ka_ver}
+BuildRequires:	kf6-extra-cmake-modules >= %{kf_ver}
+BuildRequires:	kf6-karchive-devel >= %{kf_ver}
+BuildRequires:	kf6-kcmutils-devel >= %{kf_ver}
+BuildRequires:	kf6-kcodecs-devel >= %{kf_ver}
+BuildRequires:	kf6-kcompletion-devel >= %{kf_ver}
+BuildRequires:	kf6-kconfig-devel >= %{kf_ver}
+BuildRequires:	kf6-kcontacts-devel >= %{kf_ver}
+BuildRequires:	kf6-kcoreaddons-devel >= %{kf_ver}
+BuildRequires:	kf6-ki18n-devel >= %{kf_ver}
+BuildRequires:	kf6-kio-devel >= %{kf_ver}
+BuildRequires:	kf6-kitemmodels-devel >= %{kf_ver}
+BuildRequires:	kf6-kjobwidgets-devel >= %{kf_ver}
+BuildRequires:	kf6-knewstuff-devel >= %{kf_ver}
+BuildRequires:	kf6-kservice-devel >= %{kf_ver}
+BuildRequires:	kf6-ktextaddons-devel >= 1.5.4
+BuildRequires:	kf6-ktextwidgets-devel >= %{kf_ver}
+BuildRequires:	kf6-kwidgetsaddons-devel >= %{kf_ver}
+BuildRequires:	kf6-kxmlgui-devel >= %{kf_ver}
+BuildRequires:	kf6-purpose-devel >= %{kf_ver}
 BuildRequires:	libxslt-progs
 BuildRequires:	ninja
-BuildRequires:	qt6-build >= %{qtver}
+BuildRequires:	qt6-build >= %{qt_ver}
 BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	shared-mime-info
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
+Requires:	Qt6Core >= %{qt_ver}
+Requires:	Qt6DBus >= %{qt_ver}
+Requires:	Qt6Gui >= %{qt_ver}
+Requires:	Qt6Network >= %{qt_ver}
+Requires:	Qt6Widgets >= %{qt_ver}
+Requires:	ka6-akonadi-contacts >= %{ka_ver}
+Requires:	ka6-akonadi >= %{ka_ver}
+Requires:	ka6-kimap >= %{ka_ver}
+Requires:	ka6-kldap >= %{ka_ver}
+Requires:	ka6-libkdepim >= %{ka_ver}
+Requires:	kf6-kcmutils >= %{kf_ver}
+Requires:	kf6-kcodecs >= %{kf_ver}
+Requires:	kf6-kcompletion >= %{kf_ver}
+Requires:	kf6-kconfig >= %{kf_ver}
+Requires:	kf6-kcontacts >= %{kf_ver}
+Requires:	kf6-kcoreaddons >= %{kf_ver}
+Requires:	kf6-ki18n >= %{kf_ver}
+Requires:	kf6-kio >= %{kf_ver}
+Requires:	kf6-kitemmodels >= %{kf_ver}
+Requires:	kf6-knewstuff >= %{kf_ver}
+Requires:	kf6-ktextaddons >= 1.5.4
+Requires:	kf6-kwidgetsaddons >= %{kf_ver}
+Requires:	kf6-kxmlgui >= %{kf_ver}
+Requires:	kf6-purpose >= %{kf_ver}
 Obsoletes:	ka5-pimcommon < 24
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,6 +100,12 @@ Summary:	Header files for %{kaname} development
 Summary(pl.UTF-8):	Pliki nagłówkowe dla programistów używających %{kaname}
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	Qt6DBus-devel >= %{qt_ver}
+Requires:	Qt6Gui-devel >= %{qt_ver}
+Requires:	Qt6Widgets-devel >= %{qt_ver}
+Requires:	kf6-kconfig-devel >= %{kf_ver}
+Requires:	kf6-kio-devel >= %{kf_ver}
+Requires:	kf6-ktextaddons-devel >= 1.5.4
 Obsoletes:	ka5-pimcommon-devel < 24
 
 %description devel
@@ -105,7 +135,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %ninja_install -C build
 
-%find_lang %{kaname} --all-name --with-kde
+%find_lang libpimcommon6
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%files -f %{kaname}.lang
+%files -f libpimcommon6.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libKPim6PimCommon.so.*.*.*
 %ghost %{_libdir}/libKPim6PimCommon.so.6
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka6-pimcommon.git/commitdiff/008d1fe3543d6e08a5642bb82df7cb22f1cbf22c



More information about the pld-cvs-commit mailing list