Merge branch 'master' into epel7

This commit is contained in:
Rex Dieter 2019-05-23 08:25:51 -05:00
commit 7aad6c6a92
3 changed files with 41 additions and 2 deletions

6
.gitignore vendored
View File

@ -5,3 +5,9 @@
/kfilemetadata-5.50.0.tar.xz
/kfilemetadata-5.51.0.tar.xz
/kfilemetadata-5.52.0.tar.xz
/kfilemetadata-5.53.0.tar.xz
/kfilemetadata-5.54.0.tar.xz
/kfilemetadata-5.55.0.tar.xz
/kfilemetadata-5.56.0.tar.xz
/kfilemetadata-5.57.0.tar.xz
/kfilemetadata-5.58.0.tar.xz

View File

@ -4,6 +4,7 @@
#global ffmpeg 1
%if 0%{?fedora}
%global catdoc 1
%global ebook 1
%global poppler 1
%global taglib 1
@ -11,7 +12,7 @@
Name: kf5-%{framework}
Summary: A Tier 2 KDE Framework for extracting file metadata
Version: 5.52.0
Version: 5.58.0
Release: 1%{?dist}
# # KDE e.V. may determine that future LGPL versions are accepted
@ -32,8 +33,11 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framewo
BuildRequires: extra-cmake-modules >= %{majmin}
BuildRequires: kf5-karchive-devel >= %{majmin}
BuildRequires: kf5-kcoreaddons-devel >= %{majmin}
BuildRequires: kf5-ki18n-devel >= %{majmin}
BuildRequires: kf5-rpm-macros
# optional
BuildRequires: kf5-kconfig-devel >= %{majmin}
BuildRequires: qt5-qtbase-devel
@ -41,6 +45,11 @@ BuildRequires: libattr-devel
BuildRequires: pkgconfig(exiv2) >= 0.20
## optional deps
%if %{?catdoc}
# not strictly required at build-time, satisfying runtime dep check only
BuildRequires: catdoc
Recommends: catdoc
%endif
%if 0%{?ebook}
BuildRequires: ebook-tools-devel
%endif
@ -109,6 +118,30 @@ mkdir -p %{buildroot}%{_kf5_plugindir}/kfilemetadata/writers/
%changelog
* Tue May 07 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.58.0-1
- 5.58.0
* Tue Apr 09 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.57.0-1
- 5.57.0
* Tue Mar 05 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.56.0-1
- 5.56.0
* Mon Feb 04 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.55.0-1
- 5.55.0
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.54.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 30 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.54.0-2
- rebuild (exiv2)
* Tue Jan 08 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.54.0-1
- 5.54.0
* Sun Dec 09 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.53.0-1
- 5.53.0
* Sun Nov 04 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.52.0-1
- 5.52.0

View File

@ -1 +1 @@
SHA512 (kfilemetadata-5.52.0.tar.xz) = 270c0b9ad16f7a598fe9d0741d29e1def875931de85e9dbf6744f9b040408b762bd7f845172ecf62923ca6a07b551963469fe21a811cfcf341e91ccf1b7c35cc
SHA512 (kfilemetadata-5.58.0.tar.xz) = 1a8967b10882910645254fec74a0b61fa9a7458a5cfeb105d3161deda07591871b505c4b415f2ae8612235a3fc611084da5ea534224405bdb19b0cd04a674c11