From d815dad9eef7de0a3bfc9bd433530926fd5e9f73 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 15:23:40 +0000
Subject: [PATCH 1/3] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 diff-pdf.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/diff-pdf.spec b/diff-pdf.spec
index 6e4e354..89a3be5 100644
--- a/diff-pdf.spec
+++ b/diff-pdf.spec
@@ -1,6 +1,6 @@
 Name:           diff-pdf
 Version:        0.4.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A simple tool for visually comparing two PDF files
 
 License:        GPLv2+ and LGPLv2+
@@ -38,6 +38,9 @@ automake --add-missing --copy --foreign
 
 
 %changelog
+* 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
 

From c99168c09e71ab2d882f35072498c03656056474 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
Date: Thu, 17 Dec 2020 04:32:16 +0000
Subject: [PATCH 2/3] Add BuildRequires: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 diff-pdf.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/diff-pdf.spec b/diff-pdf.spec
index 89a3be5..8eb1f87 100644
--- a/diff-pdf.spec
+++ b/diff-pdf.spec
@@ -12,6 +12,7 @@ BuildRequires:  automake
 BuildRequires:  wxGTK3-devel
 BuildRequires:  poppler-devel
 BuildRequires:  poppler-glib-devel
+BuildRequires: make
 
 %description
 %{summary}.

From 504e67b039f777f05543efb03a180e5b2991b6b3 Mon Sep 17 00:00:00 2001
From: vascom <vascom2@gmail.com>
Date: Fri, 15 Jan 2021 08:48:13 +0300
Subject: [PATCH 3/3] Do not require poppler-cairo.

---
 diff-pdf.spec | 13 ++++++++++---
 poppler.patch | 11 +++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 poppler.patch

diff --git a/diff-pdf.spec b/diff-pdf.spec
index 8eb1f87..0a698e9 100644
--- a/diff-pdf.spec
+++ b/diff-pdf.spec
@@ -1,18 +1,21 @@
 Name:           diff-pdf
 Version:        0.4.1
-Release:        4%{?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
+BuildRequires:  make
 
 %description
 %{summary}.
@@ -39,6 +42,10 @@ 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
 
diff --git a/poppler.patch b/poppler.patch
new file mode 100644
index 0000000..aff6cf0
--- /dev/null
+++ b/poppler.patch
@@ -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])