Merge branch 'master' into epel7
This commit is contained in:
commit
59d5629526
@ -1,17 +1,21 @@
|
||||
Name: diff-pdf
|
||||
Version: 0.4.1
|
||||
Release: 3%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: A simple tool for visually comparing two PDF files
|
||||
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: http://vslavik.github.io/diff-pdf/
|
||||
Source0: https://github.com/vslavik/diff-pdf/archive/v%{version}/diff-pdf-%{version}.tar.gz
|
||||
|
||||
# The same change as in
|
||||
# https://github.com/vslavik/diff-pdf/commit/00fd9ab8bf435658616f3f25b18d51b0a7ee5769
|
||||
Patch0: poppler.patch
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: automake
|
||||
BuildRequires: wxGTK3-devel
|
||||
BuildRequires: poppler-devel
|
||||
BuildRequires: poppler-glib-devel
|
||||
BuildRequires: make
|
||||
|
||||
%description
|
||||
%{summary}.
|
||||
@ -38,6 +42,13 @@ automake --add-missing --copy --foreign
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 13 2021 Marek Kasik <mkasik@redhat.com> - 0.4.1-5
|
||||
- Do not require poppler-cairo
|
||||
- It is not needed and drags in explicit dependency on poppler base library
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu Apr 09 2020 Vasiliy Glazov <vascom2@gmail.com> - 0.4.1-3
|
||||
- Disable silent make rules, thanks Orion Poplawski
|
||||
|
||||
|
11
poppler.patch
Normal file
11
poppler.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- diff-pdf-0.4.1/configure.ac
|
||||
+++ diff-pdf-0.4.1/configure.ac
|
||||
@@ -41,7 +41,7 @@ AC_LANG(C++)
|
||||
dnl === Library checks ===
|
||||
|
||||
PKG_CHECK_MODULES(POPPLER,
|
||||
- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf])
|
||||
+ [poppler-glib >= 0.10 cairo-pdf])
|
||||
|
||||
AM_OPTIONS_WXCONFIG
|
||||
AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base])
|
Loading…
Reference in New Issue
Block a user