From 6724979dcc3cbb220375061c65c7cd5f9fca981f Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Thu, 10 Dec 2009 09:25:05 +0000
Subject: [PATCH] - update to 10.47.05 - fixes pnmtofiasco, fiascotopnm,
 pamtosvg, pamtouil and ppmrainbow - upstream fix to pamtosvg caused netpbm
 not to be rebuildable on any arch     because of missing semicolon, the fix
 is now fixed :-/

---
 .cvsignore            |  2 +-
 netpbm-pamtosvg.patch | 12 ++++++++++++
 netpbm-time.patch     | 15 ++++++++-------
 netpbm.spec           | 12 ++++++++++--
 sources               |  2 +-
 5 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 netpbm-pamtosvg.patch

diff --git a/.cvsignore b/.cvsignore
index a335ee1..eb56f8a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-netpbm-10.47.04.tar.xz
+netpbm-10.47.05.tar.xz
diff --git a/netpbm-pamtosvg.patch b/netpbm-pamtosvg.patch
new file mode 100644
index 0000000..276c338
--- /dev/null
+++ b/netpbm-pamtosvg.patch
@@ -0,0 +1,12 @@
+diff -up netpbm-10.47.05/converter/other/pamtosvg/vector.c.pamtosvg netpbm-10.47.05/converter/other/pamtosvg/vector.c
+--- netpbm-10.47.05/converter/other/pamtosvg/vector.c.pamtosvg	2009-12-10 08:34:36.000000000 +0100
++++ netpbm-10.47.05/converter/other/pamtosvg/vector.c	2009-12-10 09:58:16.000000000 +0100
+@@ -39,7 +39,7 @@ vector_to_point(vector_type const v) {
+ 
+     coord.x = v.dx;
+     coord.y = v.dy;
+-    coord.z = v.dz
++    coord.z = v.dz;
+ 
+     return coord;
+ }
diff --git a/netpbm-time.patch b/netpbm-time.patch
index 8caf944..680bf88 100644
--- a/netpbm-time.patch
+++ b/netpbm-time.patch
@@ -1,20 +1,21 @@
---- netpbm-10.17/converter/other/fiasco/config.h.time	2001-05-28 02:43:11.000000000 +0200
-+++ netpbm-10.17/converter/other/fiasco/config.h	2003-09-08 15:23:17.000000000 +0200
+diff -up netpbm-10.47.05/converter/other/fiasco/config.h.time netpbm-10.47.05/converter/other/fiasco/config.h
+--- netpbm-10.47.05/converter/other/fiasco/config.h.time	2009-12-10 08:34:36.000000000 +0100
++++ netpbm-10.47.05/converter/other/fiasco/config.h	2009-12-10 08:43:54.000000000 +0100
 @@ -19,7 +19,7 @@
  #define STDC_HEADERS 1
  
  /* Define if you can safely include both <sys/time.h> and <time.h>.  */
 -#define TIME_WITH_SYS_TIME 1
-+/* #undef TIME_WITH_SYS_TIME 1 */
++/* #undef TIME_WITH_SYS_TIME */
  
- /* Define if your processor stores words with the most significant
-    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
-@@ -79,7 +79,7 @@
+ /* Define if the X Window System is missing or not being used.  */
+ #define X_DISPLAY_MISSING 1
+@@ -75,7 +75,7 @@
  #define HAVE_STRING_H 1
  
  /* Define if you have the <sys/time.h> header file.  */
 -#define HAVE_SYS_TIME_H 1
-+/* #undef HAVE_SYS_TIME_H 1 */
++/* #undef HAVE_SYS_TIME_H */
  
  /* Define if you have the <unistd.h> header file.  */
  #define HAVE_UNISTD_H 1
diff --git a/netpbm.spec b/netpbm.spec
index 686053b..14e57d2 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
-Version: 10.47.04
-Release: 3%{?dist}
+Version: 10.47.05
+Release: 1%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -28,6 +28,7 @@ Patch14: netpbm-pnmtofiasco-stdin.patch
 Patch15: netpbm-svgtopam.patch
 Patch16: netpbm-ppmpat-segfault.patch
 Patch17: netpbm-pnmsmooth-segfault.patch
+Patch18: netpbm-pamtosvg.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -86,6 +87,7 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch15 -p1 -b .svgtopam
 %patch16 -p1 -b .ppmpat-segfault
 %patch17 -p1 -b .pnmsmooth-segfault
+%patch18 -p1 -b .pamtosvg
 
 sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
 
@@ -214,6 +216,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Thu Dec 10 2009 Jindrich Novy <jnovy@redhat.com> 10.47.05-1
+- update to 10.47.05
+- fixes pnmtofiasco, fiascotopnm, pamtosvg, pamtouil and ppmrainbow
+- upstream fix to pamtosvg caused netpbm not to be rebuildable on
+  any arch because of missing semicolon, the fix is now fixed :-/
+
 * Mon Dec  7 2009 Jindrich Novy <jnovy@redhat.com> 10.47.04-3
 - fix segfault in pnmsmooth (#545089)
 
diff --git a/sources b/sources
index 06c43b8..218f280 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz
+b3076d696dff3673d66412d111356141  netpbm-10.47.05.tar.xz