[packages/ka6-akonadi] - remaining pl, cleanup

qboosh qboosh at pld-linux.org
Fri Nov 1 08:29:51 CET 2024 

commit df8760b02086a6f926ea34f65268561e46454c9a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 1 07:09:48 2024 +0100

    - remaining pl, cleanup

 ka6-akonadi.spec | 85 ++++++++++++++++++++++++++++++--------------------------
 1 file changed, 45 insertions(+), 40 deletions(-)
---
diff --git a/ka6-akonadi.spec b/ka6-akonadi.spec
index 7f1c62e..c52d7b3 100644
--- a/ka6-akonadi.spec
+++ b/ka6-akonadi.spec
@@ -1,11 +1,13 @@
 #
 # Conditional build:
-%bcond_with	tests		# build with tests
-%define		kdeappsver	24.08.2
+%bcond_with	tests		# test suite
+
+%define		kdeappsver	%{version}
 %define		kfver		5.53.0
 %define		qtver		5.15.2
 %define		kaname		akonadi
 Summary:	Akonadi - The PIM Storage Service
+Summary(pl.UTF-8):	Akonadi - usługa przechowywania danych PIM
 Name:		ka6-%{kaname}
 Version:	24.08.2
 Release:	1
@@ -13,7 +15,7 @@ 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:	c6ee7647c6c44f5d63675fa8fceeb60a
-URL:		http://www.kde.org/
+URL:		https://kde.org/
 BuildRequires:	Qt6Core-devel >= %{qtver}
 BuildRequires:	Qt6DBus-devel >= %{qtver}
 BuildRequires:	Qt6Designer-devel >= %{qtver}
@@ -51,7 +53,7 @@ BuildRequires:	shared-mime-info
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Conflicts:	akonadi-libs >= 1.0.0
-Obsoletes:	ka5-%{kaname} < %{version}
+Obsoletes:	ka5-akonadi < 24
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -77,7 +79,7 @@ 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}
-Obsoletes:	ka5-%{kaname}-devel < %{version}
+Obsoletes:	ka5-akonadi-devel < 24
 
 %description devel
 Header files for %{kaname} development.
@@ -87,12 +89,15 @@ Pliki nagłówkowe dla programistów używających %{kaname}.
 
 %package apparmor
 Summary:	Files for apparmor
+Summary(pl.UTF-8):	Pliki dla apparmor
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description apparmor
 Files for apparmor.
 
+%description apparmor -l pl.UTF-8
+Pliki dla apparmor.
 
 %prep
 %setup -q -n %{kaname}-%{version}
@@ -103,16 +108,18 @@ Files for apparmor.
 	%{!?with_tests:-DBUILD_TESTING=OFF} \
 	-DKDE_INSTALL_DOCBUNDLEDIR=%{_kdedocdir} \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+
 %ninja_build -C build
 
 %if %{with tests}
 ctest --test-dir build
 %endif
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %ninja_install -C build
+
 #install -d $RPM_BUILD_ROOT%{_includedir}/KF6/Akonadi
 #install -d $RPM_BUILD_ROOT%{_libdir}/qt6/plugins/pim5/kontact
 #install -d $RPM_BUILD_ROOT%{_libdir}/qt6/plugins/pim5/kcms
@@ -128,28 +135,47 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kaname}.lang
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/akonadi2xml
 %attr(755,root,root) %{_bindir}/akonadi_agent_launcher
 %attr(755,root,root) %{_bindir}/akonadi_agent_server
 %attr(755,root,root) %{_bindir}/akonadi_control
+%attr(755,root,root) %{_bindir}/akonadi_knut_resource
 %attr(755,root,root) %{_bindir}/akonadi_rds
 %attr(755,root,root) %{_bindir}/akonadictl
+%attr(755,root,root) %{_bindir}/akonadiselftest
 %attr(755,root,root) %{_bindir}/akonadiserver
+%attr(755,root,root) %{_bindir}/akonaditest
 %attr(755,root,root) %{_bindir}/asapcat
 %attr(755,root,root) %{_bindir}/akonadi-db-migrator
+%attr(755,root,root) %{_libdir}/libKPim6AkonadiAgentBase.so.*.*.*
+%ghost %{_libdir}/libKPim6AkonadiAgentBase.so.6
+%attr(755,root,root) %{_libdir}/libKPim6AkonadiCore.so.*.*.*
+%ghost %{_libdir}/libKPim6AkonadiCore.so.6
+%attr(755,root,root) %{_libdir}/libKPim6AkonadiPrivate.so.*.*.*
+%ghost %{_libdir}/libKPim6AkonadiPrivate.so.6
+%attr(755,root,root) %{_libdir}/libKPim6AkonadiWidgets.so.*.*.*
+%ghost %{_libdir}/libKPim6AkonadiWidgets.so.6
+%attr(755,root,root) %{_libdir}/libKPim6AkonadiXml.so.*.*.*
+%ghost %{_libdir}/libKPim6AkonadiXml.so.6
+%dir %{_libdir}/qt6/qml/org/kde/akonadi
+%attr(755,root,root) %{_libdir}/qt6/plugins/designer/akonadi6widgets.so
+%attr(755,root,root) %{_libdir}/qt6/plugins/pim6/akonadi/akonadi_test_searchplugin.so
 %dir /etc/xdg/akonadi
 /etc/xdg/akonadi/mysql-global-mobile.conf
 /etc/xdg/akonadi/mysql-global.conf
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
-%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
-%{_datadir}/mime/packages/akonadi-mime.xml
-%attr(755,root,root) %{_bindir}/akonadi2xml
-%attr(755,root,root) %{_bindir}/akonadi_knut_resource
-%attr(755,root,root) %{_bindir}/akonadiselftest
-%attr(755,root,root) %{_bindir}/akonaditest
 %dir %{_datadir}/akonadi
 %dir %{_datadir}/akonadi/agents
 %{_datadir}/akonadi/agents/knutresource.desktop
 %{_datadir}/config.kcfg/resourcebase.kcfg
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
+%{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
+%{_datadir}/kf6/akonadi/akonadi-xml.xsd
+%{_datadir}/kf6/akonadi/kcfg2dbus.xsl
+%dir %{_datadir}/kf6/akonadi_knut_resource
+%{_datadir}/kf6/akonadi_knut_resource/knut-template.xml
+%{_datadir}/mime/packages/akonadi-mime.xml
+%{_datadir}/qlogging-categories6/akonadi.categories
+%{_datadir}/qlogging-categories6/akonadi.renamecategories
 %{_iconsdir}/hicolor/128x128/apps/akonadi.png
 %{_iconsdir}/hicolor/16x16/apps/akonadi.png
 %{_iconsdir}/hicolor/22x22/apps/akonadi.png
@@ -158,25 +184,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/48x48/apps/akonadi.png
 %{_iconsdir}/hicolor/64x64/apps/akonadi.png
 %{_iconsdir}/hicolor/scalable/apps/akonadi.svgz
-%dir %{_libdir}/qt6/qml/org/kde/akonadi
-%attr(755,root,root) %{_libdir}/libKPim6AkonadiAgentBase.so.*.*
-%ghost %{_libdir}/libKPim6AkonadiAgentBase.so.6
-%attr(755,root,root) %{_libdir}/libKPim6AkonadiCore.so.*.*
-%ghost %{_libdir}/libKPim6AkonadiCore.so.6
-%attr(755,root,root) %{_libdir}/libKPim6AkonadiPrivate.so.*.*
-%ghost %{_libdir}/libKPim6AkonadiPrivate.so.6
-%attr(755,root,root) %{_libdir}/libKPim6AkonadiWidgets.so.*.*
-%ghost %{_libdir}/libKPim6AkonadiWidgets.so.6
-%attr(755,root,root) %{_libdir}/libKPim6AkonadiXml.so.*.*
-%ghost %{_libdir}/libKPim6AkonadiXml.so.6
-%attr(755,root,root) %{_libdir}/qt6/plugins/designer/akonadi6widgets.so
-%attr(755,root,root) %{_libdir}/qt6/plugins/pim6/akonadi/akonadi_test_searchplugin.so
-%{_datadir}/kf6/akonadi/akonadi-xml.xsd
-%{_datadir}/kf6/akonadi/kcfg2dbus.xsl
-%dir %{_datadir}/kf6/akonadi_knut_resource
-%{_datadir}/kf6/akonadi_knut_resource/knut-template.xml
-%{_datadir}/qlogging-categories6/akonadi.categories
-%{_datadir}/qlogging-categories6/akonadi.renamecategories
 
 # TODO subpackage
 %{_datadir}/kdevappwizard/templates/akonadiresource.tar.bz2
@@ -184,6 +191,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%{_libdir}/libKPim6AkonadiAgentBase.so
+%{_libdir}/libKPim6AkonadiCore.so
+%{_libdir}/libKPim6AkonadiPrivate.so
+%{_libdir}/libKPim6AkonadiWidgets.so
+%{_libdir}/libKPim6AkonadiXml.so
 %dir %{_includedir}/KPim6
 %{_includedir}/KPim6/Akonadi
 %{_includedir}/KPim6/AkonadiAgentBase
@@ -191,17 +203,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/KPim6/AkonadiWidgets
 %{_includedir}/KPim6/AkonadiXml
 %{_libdir}/cmake/KPim6Akonadi
-%{_libdir}/libKPim6AkonadiAgentBase.so
-%{_libdir}/libKPim6AkonadiCore.so
-%{_libdir}/libKPim6AkonadiPrivate.so
-%{_libdir}/libKPim6AkonadiWidgets.so
-%{_libdir}/libKPim6AkonadiXml.so
-
 
 %files apparmor
 %defattr(644,root,root,755)
 /etc/apparmor.d/mariadbd_akonadi
 /etc/apparmor.d/mysqld_akonadi
 /etc/apparmor.d/postgresql_akonadi
-/etc/apparmor.d%{_prefix}.bin.akonadiserver
-
+/etc/apparmor.d/usr.bin.akonadiserver
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka6-akonadi.git/commitdiff/df8760b02086a6f926ea34f65268561e46454c9a

More information about the pld-cvs-commit mailing list