From 09675964086ec3560400c8a36f9a308299fe5b5e59e6db07a2d41f90f6e971c2 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 30 Dec 2017 05:50:22 +0000 Subject: [PATCH] Accepting request 560571 from home:scarabeus_iv:branches:graphics - Add patch makeman-py3.patch to make sure to use python3 when building - Unpack the stuff only once OBS-URL: https://build.opensuse.org/request/show/560571 OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=87 --- makeman-py3.patch | 10 ++++++++++ netpbm.changes | 7 +++++++ netpbm.spec | 6 ++++-- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 makeman-py3.patch diff --git a/makeman-py3.patch b/makeman-py3.patch new file mode 100644 index 0000000..54a75bf --- /dev/null +++ b/makeman-py3.patch @@ -0,0 +1,10 @@ +Index: netpbm-10.80.1/buildtools/makeman +=================================================================== +--- netpbm-10.80.1.orig/buildtools/makeman ++++ netpbm-10.80.1/buildtools/makeman +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # + # makeman -- compile netpbm's stereotyped HTML to troff markup + # diff --git a/netpbm.changes b/netpbm.changes index 24c4761..7858996 100644 --- a/netpbm.changes +++ b/netpbm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 29 13:52:55 UTC 2017 - tchvatal@suse.com + +- Add patch makeman-py3.patch to make sure to use python3 when + building +- Unpack the stuff only once + ------------------------------------------------------------------- Mon Dec 18 13:30:51 UTC 2017 - pgajdos@suse.com diff --git a/netpbm.spec b/netpbm.spec index 0d83bad..f82b333 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -36,6 +36,7 @@ Patch3: %{name}-tmpfile.patch Patch4: %{name}-security-code.patch Patch5: %{name}-security-scripts.patch Patch6: %{name}-gcc-warnings.patch +Patch7: makeman-py3.patch BuildRequires: flex BuildRequires: libjasper-devel BuildRequires: libjpeg-devel @@ -43,7 +44,8 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libxml2-devel BuildRequires: pkgconfig -BuildRequires: python +# needed for the makeman +BuildRequires: python3-base BuildRequires: pkgconfig(x11) Provides: pbmplus @@ -80,13 +82,13 @@ found in the netpbm package. The sources are contained in the netpbm source package. %prep -%setup -q %setup -q -D -a 1 %patch0 %patch3 %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 mkdir pnmtopalm # for %%doc pnmtopalm cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm