From 85ba44421f57381320c617b3667600fc86a0a647c7b53dd19a578153bd9e6284 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 29 Dec 2020 13:09:20 +0000 Subject: [PATCH] Accepting request 859208 from home:munix9:branches:Publishing - Update to version 0.4.1 Fixes some bugs (#64, #65) that crept into 0.4. All users of 0.4 should update. - Update to version 0.4 Added new useful options contributed by @fatalmind: --skip-identical only outputs pages with actual differences --channel-tolerance makes it easy to ignore tiny differences --mark-differences adds visual markers to the margin to highlight where small changes are - Add fix-find-poppler.patch - Add man page with help2man - Clean up spec file OBS-URL: https://build.opensuse.org/request/show/859208 OBS-URL: https://build.opensuse.org/package/show/Publishing/diff-pdf?expand=0&rev=9 --- diff-pdf-0.2.tar.gz | 3 --- diff-pdf-0.4.1.tar.gz | 3 +++ diff-pdf.changes | 18 ++++++++++++++++++ diff-pdf.spec | 35 +++++++++++++++++++---------------- fix-find-poppler.patch | 11 +++++++++++ 5 files changed, 51 insertions(+), 19 deletions(-) delete mode 100644 diff-pdf-0.2.tar.gz create mode 100644 diff-pdf-0.4.1.tar.gz create mode 100644 fix-find-poppler.patch diff --git a/diff-pdf-0.2.tar.gz b/diff-pdf-0.2.tar.gz deleted file mode 100644 index 4d9e30d..0000000 --- a/diff-pdf-0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb90f2e0fd4bc3fe235111f982bc20455a1d6bc13f4219babcba6bd60c1fe466 -size 25418 diff --git a/diff-pdf-0.4.1.tar.gz b/diff-pdf-0.4.1.tar.gz new file mode 100644 index 0000000..f700545 --- /dev/null +++ b/diff-pdf-0.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d4a7f07edc767943edc7f5ea85d1dbaeb75a7760f9f585aba43e4e59aa29bd5 +size 34662 diff --git a/diff-pdf.changes b/diff-pdf.changes index b7a64db..573569c 100644 --- a/diff-pdf.changes +++ b/diff-pdf.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Dec 29 12:15:14 UTC 2020 - munix9@googlemail.com + +- Update to version 0.4.1 + Fixes some bugs (#64, #65) that crept into 0.4. + All users of 0.4 should update. + +- Update to version 0.4 + Added new useful options contributed by @fatalmind: + --skip-identical only outputs pages with actual differences + --channel-tolerance makes it easy to ignore tiny differences + --mark-differences adds visual markers to the margin to + highlight where small changes are + +- Add fix-find-poppler.patch +- Add man page with help2man +- Clean up spec file + ------------------------------------------------------------------- Sat Jun 18 10:27:21 UTC 2016 - mpluskal@suse.com diff --git a/diff-pdf.spec b/diff-pdf.spec index 1fe97ac..668dd79 100644 --- a/diff-pdf.spec +++ b/diff-pdf.spec @@ -1,7 +1,7 @@ # # spec file for package diff-pdf # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,49 +12,52 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: diff-pdf -Version: 0.2 +Version: 0.4.1 Release: 0 Summary: Simple PDF comparison tool -License: GPL-2.0 and LGPL-2.0 +License: GPL-2.0-only AND LGPL-2.0-only Group: Productivity/Publishing/PDF -Url: https://github.com/vslavik/diff-pdf -Source0: https://github.com/vslavik/diff-pdf/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +URL: https://vslavik.github.io/diff-pdf/ +Source0: https://github.com/vslavik/diff-pdf/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: fix-find-poppler.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ +BuildRequires: help2man BuildRequires: pkgconfig -BuildRequires: wxWidgets-3_0-devel +BuildRequires: wxWidgets-devel BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo-pdf) BuildRequires: pkgconfig(poppler) -BuildRequires: pkgconfig(poppler-cairo) BuildRequires: pkgconfig(poppler-glib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description diff-pdf is a simple tool for comparing two PDF files. %prep -%setup -q +%autosetup -p1 %build -export CXXFLAGS="%{optflags} -fpermissive" -export LDFLAGS='-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now' ./bootstrap %configure -make %{?_smp_mflags} V=1 +%make_build %install %make_install +install -d -m 0755 %{buildroot}%{_mandir}/man1 +help2man -N -n "%{summary}" --version-string="%{version}" --no-discard-stderr \ + -o %{buildroot}%{_mandir}/man1/%{name}.1 %{buildroot}%{_bindir}/%{name} + %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING.icons README -%{_bindir}/diff-pdf +%license COPYING COPYING.icons +%doc AUTHORS README.md +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1%{?ext_man} %changelog diff --git a/fix-find-poppler.patch b/fix-find-poppler.patch new file mode 100644 index 0000000..a302103 --- /dev/null +++ b/fix-find-poppler.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -41,7 +41,7 @@ + dnl === Library checks === + + PKG_CHECK_MODULES(POPPLER, +- [poppler-cairo >= 0.10 poppler-glib >= 0.10 cairo-pdf]) ++ [poppler >= 0.10 poppler-glib >= 0.10 cairo-pdf]) + + AM_OPTIONS_WXCONFIG + AM_PATH_WXCONFIG([3.0.0], [wxfound=1], [wxfound=0], [core,base])