From 8d393078dbe19b2f01272dade5ad07060d4e3550b976d78257a88b793b65e7db Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 7 Apr 2010 15:43:26 +0000 Subject: [PATCH] Accepting request 37066 from graphics Copy from graphics/netpbm based on submit request 37066 from user pgajdos OBS-URL: https://build.opensuse.org/request/show/37066 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netpbm?expand=0&rev=24 --- netpbm.changes | 7 +++++++ netpbm.spec | 11 ++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/netpbm.changes b/netpbm.changes index a1cf1d2..2ccab3b 100644 --- a/netpbm.changes +++ b/netpbm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 6 11:21:31 CEST 2010 - pgajdos@suse.cz + +- requires libpng12-compat-devel instead of libpng-devel for build: + netpbm will be compatible with libpng 1.4 branch from + version 10.48 + ------------------------------------------------------------------- Tue Mar 30 12:33:31 CEST 2010 - pgajdos@suse.cz diff --git a/netpbm.spec b/netpbm.spec index a8cc78e..590c0a9 100644 --- a/netpbm.spec +++ b/netpbm.spec @@ -19,8 +19,9 @@ Name: netpbm -BuildRequires: flex libjasper-devel libpng-devel libtiff-devel python -License: PERMISSIVE-OSI-COMPLIANT ; Artistic License .. ; BSD3c(or similar) ; GPLv2+ ; Public Domain, Freeware ; MIT License (or similar) +# regarding to libpng: netpbm is compatible with libpng14 from version 10.48 +BuildRequires: flex libjasper-devel libpng12-compat-devel libtiff-devel python +License: LGPLv2.1+ Group: Productivity/Graphics/Convertors Provides: pbmplus AutoReqProv: on @@ -30,7 +31,7 @@ Obsoletes: netpbm-64bit %endif # Version: 10.35.74 -Release: 1 +Release: 2 Summary: A Powerful Graphics Conversion Package Source: netpbm-%{version}.tar.bz2 Source1: netpbm-%{version}-documentation.tar.bz2 @@ -48,9 +49,9 @@ Patch3: %{name}-%{version}-security2.patch Patch4: %{name}-%{version}-pnmtopng-CAN-2978.patch # don't know what it does so far Patch5: %{name}-%{version}-tmpfile.patch -# asked upstream on 2010-04-01 +# upstreamed in development version Patch6: %{name}-%{version}-fixes.patch -# asked upstream on 2010-04-01 +# upstreamed in development version (another way) Patch7: %{name}-%{version}-pamscale.patch # upstreamed in development version Patch8: %{name}-%{version}-missing-file-close.patch