From ca09ae1907610b0d82479ca5e32344ce454221be Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Fri, 4 Sep 2009 12:27:17 +0000
Subject: [PATCH] - update to 10.35.67 - fix configuration
---
.cvsignore | 2 +-
netpbm-10.35-configfix.patch | 12 ++++++++++++
netpbm-10.35-svgtopam.patch | 6 +++---
netpbm.spec | 8 +++++++-
sources | 2 +-
5 files changed, 24 insertions(+), 6 deletions(-)
create mode 100644 netpbm-10.35-configfix.patch
diff --git a/.cvsignore b/.cvsignore
index abe586a..c34f48b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-netpbm-10.35.66.tar.bz2
+netpbm-10.35.67.tar.bz2
diff --git a/netpbm-10.35-configfix.patch b/netpbm-10.35-configfix.patch
new file mode 100644
index 0000000..b844fea
--- /dev/null
+++ b/netpbm-10.35-configfix.patch
@@ -0,0 +1,12 @@
+diff -up netpbm-10.35.67/buildtools/configure.pl.configfix netpbm-10.35.67/buildtools/configure.pl
+--- netpbm-10.35.67/buildtools/configure.pl.configfix 2009-09-04 13:56:59.000000000 +0200
++++ netpbm-10.35.67/buildtools/configure.pl 2009-09-04 14:16:48.000000000 +0200
+@@ -1893,7 +1893,7 @@ if ($platform eq "GNU") {
+ # We don't know what to do here. We used to (before 10.20) just
+ # just assume the compiler was gcc. We know that the gcc stuff
+ # above does NOT work for HP native compiler.
+- push(@config_mk, "LDSHLIB =\n");
++ push(@Makefile_config, "LDSHLIB =\n");
+ }
+ } elsif ($platform eq "AIX") {
+ push(@Makefile_config, 'LDFLAGS = -L /usr/pubsw/lib', "\n");
diff --git a/netpbm-10.35-svgtopam.patch b/netpbm-10.35-svgtopam.patch
index 2f3c55e..bd03f55 100644
--- a/netpbm-10.35-svgtopam.patch
+++ b/netpbm-10.35-svgtopam.patch
@@ -1,6 +1,6 @@
-diff -up netpbm-10.35.58/converter/other/Makefile.svgtopam netpbm-10.35.58/converter/other/Makefile
---- netpbm-10.35.58/converter/other/Makefile.svgtopam 2009-01-19 09:23:58.000000000 +0100
-+++ netpbm-10.35.58/converter/other/Makefile 2009-03-23 13:17:22.000000000 +0100
+diff -up netpbm-10.35.67/converter/other/Makefile.svgtopam netpbm-10.35.67/converter/other/Makefile
+--- netpbm-10.35.67/converter/other/Makefile.svgtopam 2009-09-04 13:57:06.000000000 +0200
++++ netpbm-10.35.67/converter/other/Makefile 2009-09-04 14:09:00.000000000 +0200
@@ -107,10 +107,6 @@ ifneq ($(ZLIB),NONE)
BINARIES += pnmtops
endif
diff --git a/netpbm.spec b/netpbm.spec
index f252ed2..79a1e19 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,6 +1,6 @@
Summary: A library for handling different graphics file formats
Name: netpbm
-Version: 10.35.66
+Version: 10.35.67
Release: 1%{?dist}
# See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain
@@ -31,6 +31,7 @@ Patch22: netpbm-10.35-pnmmontagefix.patch
Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
Patch24: netpbm-10.35-64bitfix.patch
Patch29: netpbm-10.35-svgtopam.patch
+Patch30: netpbm-10.35-configfix.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel
@@ -92,6 +93,7 @@ netpbm-progs. You'll also need to install the netpbm package.
%patch23 -p1 -b .pnmtofiasco-stdin
%patch24 -p1 -b .64bitfix
%patch29 -p1 -b .svgtopam
+%patch30 -p1 -b .configfix
%build
./configure <<EOF
@@ -217,6 +219,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/netpbm/
%changelog
+* Fri Sep 4 2009 Jindrich Novy <jnovy@redhat.com> 10.35.67-1
+- update to 10.35.67
+- fix configuration
+
* Wed Jul 29 2009 Jindrich Novy <jnovy@redhat.com> 10.35.66-1
- update to 10.35.66
- sync svgatopam patch
diff --git a/sources b/sources
index a7dca12..5e25365 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb8d716535f9359fb95bcafa81b7304b netpbm-10.35.66.tar.bz2
+6d9b4ec5ffbbb42cd63c94b010694194 netpbm-10.35.67.tar.bz2