Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2020-04-04 17:45:43 +03:00
commit f21c05df60
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
3 changed files with 87 additions and 10 deletions

16
.gitignore vendored
View File

@ -1,2 +1,18 @@
/akonadi-contacts-18.04.0.tar.xz
/akonadi-contacts-18.04.1.tar.xz
/akonadi-contacts-18.04.2.tar.xz
/akonadi-contacts-18.04.3.tar.xz
/akonadi-contacts-18.08.1.tar.xz
/akonadi-contacts-18.08.2.tar.xz
/akonadi-contacts-18.08.3.tar.xz
/akonadi-contacts-18.12.0.tar.xz
/akonadi-contacts-18.12.1.tar.xz
/akonadi-contacts-18.12.2.tar.xz
/akonadi-contacts-18.12.3.tar.xz
/akonadi-contacts-19.04.2.tar.xz
/akonadi-contacts-19.04.3.tar.xz
/akonadi-contacts-19.08.2.tar.xz
/akonadi-contacts-19.08.3.tar.xz
/akonadi-contacts-19.12.1.tar.xz
/akonadi-contacts-19.12.2.tar.xz
/akonadi-contacts-19.12.3.tar.xz

View File

@ -8,8 +8,8 @@
%endif
Name: kf5-%{framework}
Version: 18.04.1
Release: 1.0.riscv64%{?dist}
Version: 19.12.3
Release: 2.0.riscv64%{?dist}
Summary: The Akonadi Contacts Library
License: LGPLv2+
@ -50,7 +50,9 @@ BuildRequires: cmake(Qt5Widgets) >= 5.8
%global majmin_ver %{version}
BuildRequires: kf5-akonadi-mime-devel >= %{majmin_ver}
BuildRequires: kf5-akonadi-server-devel >= %{majmin_ver}
%if !(0%{?rhel} == 8 && ( "%{_arch}" == "aarch64" || "%{_arch}" == "s390x" ))
BuildRequires: kf5-kcalendarcore-devel >= %{majmin_ver}
%endif
BuildRequires: kf5-kcontacts-devel >= %{majmin_ver}
BuildRequires: kf5-kmime-devel >= %{majmin_ver}
@ -77,7 +79,7 @@ Obsoletes: kf5-akonadi-contact-devel < 16.07
Provides: kf5-akonadi-contact-devel = %{version}-%{release}
Requires: cmake(KF5Akonadi)
Requires: cmake(KF5Contacts)
Requires: cmake(KF5CalendarCore)
Recommends: cmake(KF5CalendarCore)
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
@ -115,8 +117,7 @@ xvfb-run -a \
%ldconfig_scriptlets
%files -f %{name}.lang
%{_kf5_sysconfdir}/xdg/%{framework}.*
%{_kf5_sysconfdir}/xdg/contact-editor.*
%{_kf5_datadir}/qlogging-categories5/*%{framework}.*
%{_kf5_libdir}/libKF5AkonadiContact.so.*
%{_kf5_libdir}/libKF5ContactEditor.so.*
%{_kf5_qtplugindir}/kcm_akonadicontact_actions.so
@ -126,9 +127,6 @@ xvfb-run -a \
%{_kf5_datadir}/kservices5/akonadicontact_actions.desktop
%dir %{_kf5_datadir}/kf5/akonadi/
%{_kf5_datadir}/kf5/akonadi/contact/
%dir %{_kf5_datadir}/kservices5/akonadi/
%{_kf5_datadir}/kservices5/akonadi/contact/
%{_kf5_datadir}/kservicetypes5/kaddressbookimprotocol.desktop
%files devel
%{_kf5_libdir}/cmake/KF5AkonadiContact/
@ -145,9 +143,72 @@ xvfb-run -a \
%changelog
* Mon Jun 25 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 18.04.1-1.0.riscv64
* Sat Apr 04 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 19.12.3-2.0.riscv64
- Experimental change to remove qt5-qtwebengine dependency
* Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 19.12.3-2
- Fix string quoting for rpm >= 4.16
* Sat Mar 07 2020 Rex Dieter <rdieter@fedoraproject.org> - 19.12.3-1
- 19.12.3
* Tue Feb 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 19.12.2-1
- 19.12.2
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jan 18 2020 Rex Dieter <rdieter@fedoraproject.org> - 19.12.1-1
- 19.12.1
* Mon Nov 11 2019 Rex Dieter <rdieter@fedoraproject.org> - 19.08.3-1
- 19.08.3
* Fri Oct 18 2019 Rex Dieter <rdieter@fedoraproject.org> - 19.08.2-1
- 19.08.2
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.04.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Jul 12 2019 Rex Dieter <rdieter@fedoraproject.org> - 19.04.3-1
- 19.04.3
* Wed Jun 05 2019 Rex Dieter <rdieter@fedoraproject.org> - 19.04.2-1
- 19.04.2
* Fri Mar 08 2019 Rex Dieter <rdieter@fedoraproject.org> - 18.12.3-1
- 18.12.3
* Tue Feb 05 2019 Rex Dieter <rdieter@fedoraproject.org> - 18.12.2-1
- 18.12.2
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 08 2019 Rex Dieter <rdieter@fedoraproject.org> - 18.12.1-1
- 18.12.1
* Fri Dec 14 2018 Rex Dieter <rdieter@fedoraproject.org> - 18.12.0-1
- 18.12.0
* Tue Nov 06 2018 Rex Dieter <rdieter@fedoraproject.org> - 18.08.3-1
- 18.08.3
* Wed Oct 10 2018 Rex Dieter <rdieter@fedoraproject.org> - 18.08.2-1
- 18.08.2
* Mon Oct 01 2018 Rex Dieter <rdieter@fedoraproject.org> - 18.08.1-1
- 18.08.1
* Fri Jul 13 2018 Rex Dieter <rdieter@fedoraproject.org> - 18.04.3-1
- 18.04.3
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 18.04.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 06 2018 Rex Dieter <rdieter@fedoraproject.org> - 18.04.2-1
- 18.04.2
* Wed May 09 2018 Rex Dieter <rdieter@fedoraproject.org> - 18.04.1-1
- 18.04.1

View File

@ -1 +1 @@
SHA512 (akonadi-contacts-18.04.1.tar.xz) = 30c6f45fe5ccbc3394144388ffe6c3314c1a1fd85b67e58e0d606b14c31209091ac8f6e5281f22c295bc8bb45d2265a471cc4173952a406963046138ebada929
SHA512 (akonadi-contacts-19.12.3.tar.xz) = 23f896114ba66cce06069538768559c665e6d0bf7bc24b3cd2d801d41e7421f2f79f670a0af740dfbcd3fdc48584ff77cf2e156159450e484b0b8b137cdee4c2