From 6f800870f4133ceb80a9c628bbf3ccc62f34f73b Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Fri, 9 Oct 2009 13:17:43 +0000
Subject: [PATCH] - update to 10.35.68

---
 .cvsignore                   |  2 +-
 netpbm-10.35-configfix.patch | 12 ------------
 netpbm.spec                  | 11 ++++++-----
 sources                      |  2 +-
 4 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 netpbm-10.35-configfix.patch

diff --git a/.cvsignore b/.cvsignore
index c34f48b..ace7203 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-netpbm-10.35.67.tar.bz2
+netpbm-10.35.68.tar.xz
diff --git a/netpbm-10.35-configfix.patch b/netpbm-10.35-configfix.patch
deleted file mode 100644
index b844fea..0000000
--- a/netpbm-10.35-configfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.spec b/netpbm.spec
index 79a1e19..8b56b66 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,16 +1,16 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.35.67
+Version: 10.35.68
 Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
 # Source0 is prepared by
-# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{version}
+# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/super_stable netpbm-%{version}
 # svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
 # and removing the .svn directories
-Source0: netpbm-%{version}.tar.bz2
+Source0: netpbm-%{version}.tar.xz
 Patch1: netpbm-10.17-time.patch
 Patch2: netpbm-9.24-strip.patch
 Patch3: netpbm-10.19-message.patch
@@ -31,7 +31,6 @@ 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
@@ -93,7 +92,6 @@ 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
@@ -219,6 +217,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Fri Oct  9 2009 Jindrich Novy <jnovy@redhat.com> 10.35.68-1
+- update to 10.35.68
+
 * Fri Sep  4 2009 Jindrich Novy <jnovy@redhat.com> 10.35.67-1
 - update to 10.35.67
 - fix configuration
diff --git a/sources b/sources
index 5e25365..4e9a8ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d9b4ec5ffbbb42cd63c94b010694194  netpbm-10.35.67.tar.bz2
+364add7dc5d66ecd44eec65f3d92d39b  netpbm-10.35.68.tar.xz