diff --git a/akonadi.spec b/akonadi.spec index d0d32a4..2110e89 100644 --- a/akonadi.spec +++ b/akonadi.spec @@ -1,6 +1,6 @@ %define gccver %(gcc -dumpversion) Name: akonadi -Version: 23.08.5 +Version: 24.02.1 Release: 1mamba Summary: PIM Storage Service Group: System/Libraries @@ -8,39 +8,37 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://userbase.kde.org/Akonadi -Source: http://download.kde.org/stable/release-service/%{version}/src/akonadi-%{version}.tar.xz +Source: https://download.kde.org/%{stable_kde6}/release-service/%{version}/src/akonadi-%{version}.tar.xz Patch0: akonadi-16.04.2-qt-5.7.0-sqlite3.patch Patch1: akonadi-22.04.2-revert-deleting-ib_logfile0.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libaccounts-qt5-devel +BuildRequires: libaccounts-qt6-devel BuildRequires: libgcc +BuildRequires: libglvnd-devel BuildRequires: libkaccounts-integration-devel -BuildRequires: libkauth-devel -BuildRequires: libkcodecs-devel -BuildRequires: libkconfig-devel -BuildRequires: libkconfigwidgets-devel -BuildRequires: libkcoreaddons-devel -BuildRequires: libkcrash-devel -BuildRequires: libki18n-devel -BuildRequires: libkiconthemes-devel -BuildRequires: libkio-devel -BuildRequires: libkitemmodels-devel -BuildRequires: libkservice-devel -BuildRequires: libkwidgetsaddons-devel -BuildRequires: libkxmlgui-devel +BuildRequires: libkf6-kcolorscheme-devel +BuildRequires: libkf6-kconfig-devel +BuildRequires: libkf6-kconfigwidgets-devel +BuildRequires: libkf6-kcoreaddons-devel +BuildRequires: libkf6-kcrash-devel +BuildRequires: libkf6-ki18n-devel +BuildRequires: libkf6-kiconthemes-devel +BuildRequires: libkf6-kio-devel +BuildRequires: libkf6-kitemmodels-devel +BuildRequires: libkf6-kwidgetsaddons-devel +BuildRequires: libkf6-kxmlgui-devel BuildRequires: liblzma-devel BuildRequires: libstdc++6-devel BuildRequires: libxml2-devel -BuildRequires: qt5-qtbase-devel +BuildRequires: qt6-qtbase-devel ## AUTOBUILDREQ-END BuildRequires: cmake BuildRequires: automoc4 -BuildRequires: libqt5-devel >= 5.6.1 BuildRequires: libkaccounts-integration-devel >= 20.08.0 BuildRequires: libxapian-devel -Requires: libqt5-mysql +Requires: qt6-qtbase-mysql Requires: mariadb >= 10.1 Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Provides: akonadi5 @@ -54,8 +52,7 @@ This package contains the server and control files. %package -n lib%{name} Group: System/Libraries Summary: Static libraries and headers for %{name} -Provides: libakonadi5 -Obsoletes: libakonadi5 < 22.04.0 +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description -n lib%{name} PIM Storage Service. @@ -65,9 +62,6 @@ Group: Development/Libraries Summary: Static libraries and headers for %{name} Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -#Requires: libstdc++6-devel == %{gccver} -Provides: libakonadi5-devel -Obsoletes: libakonadi5-devel < 22.04.0 %description -n lib%{name}-devel PIM Storage Service. @@ -77,45 +71,21 @@ This package contains static libraries and header files need for development. %prep %setup -q -n akonadi-%{version} -#-D -T -#:<< _EOF -#%patch0 -p1 -#%patch1 -p1 -b .revert-deleting-ib_logfile0 %build -#:<< _EOF -%cmake_kde5 -d build \ +%cmake_kf6\ -DDATABASE_BACKEND=MYSQL \ %ifarch arm -DCMAKE_CXX_FLAGS="-latomic" %endif -# -DCONFIG_INSTALL_DIR:PATH=%{_sysconfdir} \ - -%make +%cmake_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall -C build +%cmake_install -#install -d -m0755 %{buildroot}%{_sysconfdir}/xprofile.d/ -#cat >> %{buildroot}%{_sysconfdir}/xprofile.d/akonadi.sh << _EOF -## set akonadi default backend db to QSQLITE3 when mysqld is not installed -#if [ ! -e %{_sbindir}/mysqld -a -e ~/.config/akonadi/akonadiserverrc -a ! -e ~/.config/akonadi.backup.mysqld ]; then -# [ "`grep "Driver=QMYSQL" ~/.config/akonadi/akonadiserverrc`" ] && mv ~/.config/akonadi ~/.config/akonadi.backup.mysqld -#fi -#_EOF -#chmod +x %{buildroot}%{_sysconfdir}/xprofile.d/akonadi.sh - -install -d -m0755 %{buildroot}%{_sysconfdir}/prelink.conf.d -cat > %{buildroot}%{_sysconfdir}/prelink.conf.d/akonadi.conf << _EOF --b %{_bindir}/akonadi_rds --b %{_bindir}/akonadictl --b %{_bindir}/akonadiserver --b %{_bindir}/asapcat -_EOF - -%find_lang %{name}5_qt --with-qt --all-name || touch %{name}5_qt.lang +%find_lang %{name} --with-qt --all-name || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -130,11 +100,10 @@ update-mime-database -n %{_datadir}/mime &> /dev/null update-mime-database -n %{_datadir}/mime &> /dev/null : -%files -f %{name}5_qt.lang +%files -f %{name}.lang %defattr(-,root,root) %dir %{_sysconfdir}/apparmor.d %{_sysconfdir}/apparmor.d/* -%{_sysconfdir}/prelink.conf.d/akonadi.conf %dir %{_sysconfdir}/xdg/akonadi %{_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf %{_sysconfdir}/xdg/akonadi/mysql-global.conf @@ -146,52 +115,60 @@ update-mime-database -n %{_datadir}/mime &> /dev/null %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.* %{_datadir}/mime/packages/akonadi-mime.xml %{_datadir}/kdevappwizard/templates/akonadi*.tar.bz2 -%{_datadir}/qlogging-categories5/akonadi.categories -%{_datadir}/qlogging-categories5/akonadi.renamecategories +%{_datadir}/qlogging-categories6/akonadi.categories +%{_datadir}/qlogging-categories6/akonadi.renamecategories %{_datadir}/icons/hicolor/*/apps/akonadi.png %{_datadir}/icons/hicolor/scalable/apps/akonadi.svgz +%{_kf6_datadir}/kf6/akonadi/akonadi-xml.xsd +%{_kf6_datadir}/kf6/akonadi/kcfg2dbus.xsl +%{_kf6_datadir}/kf6/akonadi_knut_resource/knut-template.xml %files -n lib%{name} %defattr(-,root,root) -%{_libdir}/libKPim5AkonadiAgentBase.so.* -%{_libdir}/libKPim5AkonadiCore.so.* -%{_libdir}/libKPim5AkonadiPrivate.so.* -%{_libdir}/libKPim5AkonadiWidgets.so.* -%{_libdir}/libKPim5AkonadiXml.so.* -#%{_qt5_plugindir}/sqldrivers/libqsqlite3.so -%{_libdir}/qt5/plugins/designer/akonadi5widgets.so -%{_libdir}/qt5/plugins/pim5/akonadi/akonadi_test_searchplugin.so -%{_kde5_datadir}/kf5/akonadi/akonadi-xml.xsd -%{_kde5_datadir}/kf5/akonadi/kcfg2dbus.xsl -%{_kde5_datadir}/kf5/akonadi_knut_resource/knut-template.xml +%{_libdir}/libKPim6AkonadiAgentBase.so.* +%{_libdir}/libKPim6AkonadiCore.so.* +%{_libdir}/libKPim6AkonadiPrivate.so.* +%{_libdir}/libKPim6AkonadiWidgets.so.* +%{_libdir}/libKPim6AkonadiXml.so.* +%{_qt6_plugindir}/designer/akonadi6widgets.so +%{_qt6_plugindir}/pim6/akonadi/akonadi_test_searchplugin.so %doc AUTHORS %files -n lib%{name}-devel %defattr(-,root,root) -%dir %{_includedir}/KPim5/Akonadi -%{_includedir}/KPim5/Akonadi/* -%dir %{_includedir}/KPim5/AkonadiAgentBase -%{_includedir}/KPim5/AkonadiAgentBase/* -%dir %{_includedir}/KPim5/AkonadiCore -%{_includedir}/KPim5/AkonadiCore/* -%dir %{_includedir}/KPim5/AkonadiWidgets -%{_includedir}/KPim5/AkonadiWidgets/* -%dir %{_includedir}/KPim5/AkonadiXml -%{_includedir}/KPim5/AkonadiXml/* -%{_libdir}/libKPim5AkonadiAgentBase.so -%{_libdir}/libKPim5AkonadiCore.so -%{_libdir}/libKPim5AkonadiPrivate.so -%{_libdir}/libKPim5AkonadiWidgets.so -%{_libdir}/libKPim5AkonadiXml.so -%dir %{_kde5_libdir}/cmake/KF5Akonadi -%{_kde5_libdir}/cmake/KF5Akonadi/KF5Akonadi*.cmake -%{_kde5_libdir}/cmake/KF5Akonadi/KPim*.cmake -%dir %{_libdir}/cmake/KPim5Akonadi -%{_libdir}/cmake/KPim5Akonadi/KPim*.cmake -%{_libdir}/qt5/mkspecs/modules/qt_Akonadi*.pri +%dir %{_includedir}/KPim6/Akonadi +%{_includedir}/KPim6/Akonadi/* +%dir %{_includedir}/KPim6/AkonadiAgentBase +%{_includedir}/KPim6/AkonadiAgentBase/* +%dir %{_includedir}/KPim6/AkonadiCore +%{_includedir}/KPim6/AkonadiCore/* +%dir %{_includedir}/KPim6/AkonadiWidgets +%{_includedir}/KPim6/AkonadiWidgets/* +%dir %{_includedir}/KPim6/AkonadiXml +%{_includedir}/KPim6/AkonadiXml/* +%{_libdir}/libKPim6AkonadiAgentBase.so +%{_libdir}/libKPim6AkonadiCore.so +%{_libdir}/libKPim6AkonadiPrivate.so +%{_libdir}/libKPim6AkonadiWidgets.so +%{_libdir}/libKPim6AkonadiXml.so +%dir %{_libdir}/cmake/KPim6Akonadi +%{_libdir}/cmake/KPim6Akonadi/KPimAkonadiMacros.cmake +%{_libdir}/cmake/KPim6Akonadi/KPim6Akonadi*.cmake +%{_qt6_docdir}/KPim6Akonadi*.qch +%{_qt6_docdir}/KPim6Akonadi*.tags %doc NEWS README.md %changelog +* Thu Mar 21 2024 Automatic Build System 24.02.1-1mamba +- automatic version update by autodist + +* Sat Mar 16 2024 Silvan Calarco 24.02.0-2mamba +- require qt6-base-mysql instead of qt5-mysql +- remove obsoletes for libakonadi5 and other cleanups + +* Fri Mar 01 2024 Automatic Build System 24.02.0-1mamba +- automatic version update by autodist + * Fri Feb 16 2024 Automatic Build System 23.08.5-1mamba - automatic version update by autodist