rpms/netpbm/devel netpbm-pamtosvg.patch, NONE, 1.1 .cvsignore, 1.60, 1.61 netpbm-time.patch, 1.1, 1.2 netpbm.spec, 1.149, 1.150 sources, 1.64, 1.65

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5124

Modified Files:
	.cvsignore netpbm-time.patch netpbm.spec sources 
Added Files:
	netpbm-pamtosvg.patch 
Log Message:
* Thu Dec 10 2009 Jindrich Novy <jnovy at 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 :-/


netpbm-pamtosvg.patch:
 vector.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE netpbm-pamtosvg.patch ---
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;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	21 Oct 2009 15:31:04 -0000	1.60
+++ .cvsignore	10 Dec 2009 09:25:05 -0000	1.61
@@ -1 +1 @@
-netpbm-10.47.04.tar.xz
+netpbm-10.47.05.tar.xz

netpbm-time.patch:
 config.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: netpbm-time.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-time.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netpbm-time.patch	21 Oct 2009 15:11:20 -0000	1.1
+++ netpbm-time.patch	10 Dec 2009 09:25:05 -0000	1.2
@@ -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


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- netpbm.spec	8 Dec 2009 09:18:42 -0000	1.149
+++ netpbm.spec	10 Dec 2009 09:25:05 -0000	1.150
@@ -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 insta
 %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 at 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 at redhat.com> 10.47.04-3
 - fix segfault in pnmsmooth (#545089)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	21 Oct 2009 15:31:05 -0000	1.64
+++ sources	10 Dec 2009 09:25:05 -0000	1.65
@@ -1 +1 @@
-87d9e65a88c929bfbc60f9d4f3d87d5b  netpbm-10.47.04.tar.xz
+b3076d696dff3673d66412d111356141  netpbm-10.47.05.tar.xz