Christophe Giboudeaux 2021-07-27 09:35:33 +00:00 committed by Git OBS Bridge
parent 4dc532f090
commit b745feb964
6 changed files with 49 additions and 29 deletions

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Jul 17 20:04:44 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.07.80
* New feature release
- Changes since 21.04.3:
* Make sure that we don't cancel dialog
* Port away from KStatefulBrush::brush(const QWidget*)
* Add CMake check for KCMUtils without which akonadi-contacts fails to compile
* It's already find in top level
* Use K_PLUGIN_CLASS_WITH_JSON install in pim/kcm/kaddressbook too
* Remove ServiceTypes
* Fix some clazy warning
* Modernize code
* Remove unused includes
* Fix mem leak found by asan
* Replace std::binary_function usage with a lambda
* Fix for MSVC compile
* Add missing parent
- Only install the license files once
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 7 08:56:35 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr> Wed Jul 7 08:56:35 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -23,15 +23,15 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without lang %bcond_without lang
Name: akonadi-contact Name: akonadi-contact
Version: 21.04.3 Version: 21.07.80
Release: 0 Release: 0
Summary: KDE PIM Libraries for Akonadi Contacts Summary: KDE PIM Libraries for Akonadi Contacts
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: System/GUI/KDE Group: System/GUI/KDE
URL: https://www.kde.org URL: https://www.kde.org
Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
%if %{with lang} %if %{with lang}
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
Source2: applications.keyring Source2: applications.keyring
%endif %endif
BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: extra-cmake-modules >= %{kf5_version}
@ -46,6 +46,8 @@ BuildRequires: cmake(KF5DBusAddons) >= %{kf5_version}
BuildRequires: cmake(KF5GrantleeTheme) BuildRequires: cmake(KF5GrantleeTheme)
BuildRequires: cmake(KF5I18n) >= %{kf5_version} BuildRequires: cmake(KF5I18n) >= %{kf5_version}
BuildRequires: cmake(KF5IconThemes) >= %{kf5_version} BuildRequires: cmake(KF5IconThemes) >= %{kf5_version}
# Needed by kdesktopjson
BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version}
BuildRequires: cmake(KF5KIO) >= %{kf5_version} BuildRequires: cmake(KF5KIO) >= %{kf5_version}
BuildRequires: cmake(KF5Libkleo) BuildRequires: cmake(KF5Libkleo)
BuildRequires: cmake(KF5Mime) BuildRequires: cmake(KF5Mime)
@ -58,7 +60,6 @@ BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Widgets)
Requires: libKF5AkonadiContact5 = %{version} Requires: libKF5AkonadiContact5 = %{version}
Requires: libKF5ContactEditor5 = %{version} Requires: libKF5ContactEditor5 = %{version}
Recommends: %{name}-lang
Provides: akonadi-contacts = %{version} Provides: akonadi-contacts = %{version}
Obsoletes: akonadi-contacts < %{version} Obsoletes: akonadi-contacts < %{version}
@ -141,19 +142,19 @@ to develop KDE PIM applications.
%{_kf5_debugdir}/*.categories %{_kf5_debugdir}/*.categories
%{_kf5_debugdir}/*.renamecategories %{_kf5_debugdir}/*.renamecategories
%{_kf5_plugindir}/akonadi/contacts/plugins/ %{_kf5_plugindir}/akonadi/contacts/plugins/
%{_kf5_plugindir}/kcm_akonadicontact_actions.so %dir %{_kf5_plugindir}/pim/
%dir %{_kf5_plugindir}/pim/kcms/
%dir %{_kf5_plugindir}/pim/kcms/kaddressbook
%{_kf5_plugindir}/pim/kcms/kaddressbook/kcm_akonadicontact_actions.so
%{_kf5_servicesdir}/akonadicontact_actions.desktop %{_kf5_servicesdir}/akonadicontact_actions.desktop
%files -n libKF5AkonadiContact5 %files -n libKF5AkonadiContact5
%license LICENSES/*
%{_kf5_libdir}/libKF5AkonadiContact.so.* %{_kf5_libdir}/libKF5AkonadiContact.so.*
%files -n libKF5ContactEditor5 %files -n libKF5ContactEditor5
%license LICENSES/*
%{_kf5_libdir}/libKF5ContactEditor.so.* %{_kf5_libdir}/libKF5ContactEditor.so.*
%files -n akonadi-plugin-contacts %files -n akonadi-plugin-contacts
%license LICENSES/*
%{_kf5_plugindir}/akonadi_serializer_addressee.so %{_kf5_plugindir}/akonadi_serializer_addressee.so
%{_kf5_plugindir}/akonadi_serializer_contactgroup.so %{_kf5_plugindir}/akonadi_serializer_contactgroup.so
%dir %{_kf5_sharedir}/akonadi %dir %{_kf5_sharedir}/akonadi
@ -163,7 +164,6 @@ to develop KDE PIM applications.
%{_kf5_sharedir}/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop %{_kf5_sharedir}/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
%files devel %files devel
%license LICENSES/*
%dir %{_kf5_includedir}/Akonadi %dir %{_kf5_includedir}/Akonadi
%dir %{_kf5_includedir}/ContactEditor %dir %{_kf5_includedir}/ContactEditor
%dir %{_kf5_includedir}/akonadi %dir %{_kf5_includedir}/akonadi
@ -181,7 +181,6 @@ to develop KDE PIM applications.
%if %{with lang} %if %{with lang}
%files lang -f %{name}.lang %files lang -f %{name}.lang
%license LICENSES/*
%endif %endif
%changelog %changelog

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45c3128f58459dff8460757436dfce6f4996a53ea69036cf87ce1022a4e084de
size 424004

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmDj6aoACgkQu0YzUNbv
Me+eyg//a+KZqJVbCNmShNT6aEFxhxkmIjg3uMynWZHxswlYhm+6W7X8WK6ACVLl
nBwg5MregbY0R248e8oqyIlKpiOVVrafILGPF+R7NYEQOycuzHR64st5++0LiJI8
E/Yno0I/b+xzkjGd+LgrYXqA+Fo+hVJ0xFCVHMwJnLbfOc/6pqrO3Fs5I3zbxpcr
rEgBm/ckipZaLyS8sW7tYVFpaNiyJCIeocuEkMiYeyTQ2jRgrucP0bZxHeHe8hpv
ws0TpAdiVOZy+f5KQkcholEdrP6eo0D4iYNHUnoSgwuaFdhjAq7mC65vDRBBys6l
3BTDe25IIpDx1F3/rsW9L0I6tfTyIGgIUJKgJ4G+MpWFoVg9BYbgnQ74lmOgPRz+
xjK2hu9dgxFH1ufeZGak8b4wRhG6oRnXcqJeBBCe0SekWSxfDe8XQjo+vlusOhaE
6oA6+o7/+VXG5JTpvRH5g24pY+Sh89n/FdAlv7TBRFU1ijuV6fqhQs5PPv7s8bCU
L++Q8rij4KaF0qjXI5ldmJj5hZxGjCzHnVWNybEGwKZdmnlh6/HI4O+uX7qxSEag
qzXDhCq3lHXb9dlT+vvhiQj/sPxRjXyYpquhHMX3lgHTj8Hpa5RmUW/pU50wb0hJ
Ua890HXX1jsKnDNRipRw8Rj+m1WW4baPj0qz6lbn74LjMCHV1ME=
=TwKh
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dcce91a81bf588f116e6077557c7079b01a42aec26da567dd5ecff07f01c76d0
size 421980

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmDxi4QACgkQOmpNuDnq
ptdQ4RAApJE3jwp9yf5em8uOw7uvpz2CMWbZjRCQcJ5TwRqpcHZuEShgg8xsEKfK
ZtRHu4dxh2QeXeMWd6FiTd/vzT0nPoZICLcv0rjEDy10NjkSW9bkr8SgoqZMOU2T
98zYMm/x2E9B8O+rNAvekcTzJXcgatJW967cJrFS0jJPCi1axNjyxz9VugbgsOt1
2cl3m+bbMXAhnZrVGlp/svXC54wsSXXdv5mapPQ3d1pTVvlkONc6tBf+5dh/3qtj
qqPjfLLGVwrJQ2qHPxSym+qeRgVMaT+R2nk1syUl6L89p/RSrEemmvt1KJW7Nvxn
XTlxs82Ipqza6wrx5ex02oj6PU2YO/c0oJ83qtI/xaQkCaaJmSkDL3oCFS5UJKxp
lsLoahDsDflPsnYgnMzQ55MrQk/jgpOcrbTUFCVWBN+8yZwhqNSwPU3jEfv3EHb9
RZ51/uL14pI+95XLMXE9ET07mK2GMPZcUBQWEBRYEs8c2FHHa1a8A9PkvMcEwA8z
EcvRRz3GKadfPn4PnMLX7shnjzrsUKFN5alVH/KFW9UUzC3A2cWUnKjEb6PGpTDz
5/fwXKB945g8d76Swyh/RvZATeEoHMYsfcJATln45kVHcSEloe5Trm5+I68pnHS3
XPgL2IXR6KQOV+v/OAQCCsqLuIhTBCZFc5z8kFYecBrGb4mHpkE=
=yqEv
-----END PGP SIGNATURE-----