rpms/netpbm/devel netpbm-10.35-ppmfadeusage.patch, NONE, 1.1 netpbm-10.35-ppmrainbowexit.patch, NONE, 1.1 netpbm.spec, 1.133, 1.134

[Jindrich Novy]

Author: jnovy

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

Modified Files:
	netpbm.spec 
Added Files:
	netpbm-10.35-ppmfadeusage.patch 
	netpbm-10.35-ppmrainbowexit.patch 
Log Message:
* Thu Feb 26 2009 Jindrich Novy <jnovy at redhat.com> 10.35.60-3
- fix broken perl syntax in ppmfade
- fix exit status and error reporting in ppmrainbow


netpbm-10.35-ppmfadeusage.patch:

--- NEW FILE netpbm-10.35-ppmfadeusage.patch ---
diff -up netpbm-10.35.60/editor/ppmfade.ppmfadeusage netpbm-10.35.60/editor/ppmfade
--- netpbm-10.35.60/editor/ppmfade.ppmfadeusage	2009-02-26 17:43:14.000000000 +0100
+++ netpbm-10.35.60/editor/ppmfade	2009-02-26 17:43:44.000000000 +0100
@@ -36,6 +36,8 @@ my $mode = $SPREAD;		# default fading mo
 #
 #  Check those command line args.
 #
+sub usage();
+
 if (@ARGV == 0) {
     usage();
 }

netpbm-10.35-ppmrainbowexit.patch:

--- NEW FILE netpbm-10.35-ppmrainbowexit.patch ---
diff -up netpbm-10.35.60/generator/ppmrainbow.ppmrainbowexit netpbm-10.35.60/generator/ppmrainbow
--- netpbm-10.35.60/generator/ppmrainbow.ppmrainbowexit	2009-02-15 13:04:35.000000000 +0100
+++ netpbm-10.35.60/generator/ppmrainbow	2009-02-26 18:48:34.000000000 +0100
@@ -21,15 +21,16 @@ GetOptions("width=i"   => \$Twid,
            "norepeat!" => \$norepeat,
            "verbose!"  => \$verbose);
 
+$! = 1;
 die "invalid width and/or height\n" unless $Twid >= 1 && $Thgt >= 1;
 
 my $verboseCommand = $verbose ? "set -x;" : "";
 
 if (@ARGV < 1) {
-    die("You must specify at least one color as an argument");
+    die("You must specify at least one color as an argument\n");
 } elsif (@ARGV < 2 && $norepeat) {
     die("With the -norepeat option, you must specify at least two colors " .
-        "as arguments.");
+        "as arguments.\n");
 }
 
 my @colorlist;
@@ -57,7 +58,7 @@ while (@colorlist >= 2) {
     my $rc = system("$verboseCommand pgmramp -lr $w $Thgt | " .
                     "pgmtoppm \"$colorlist[0]-$colorlist[1]\" >$outfile");
     if ($rc != 0) {
-        die("pgmramp|pgmtoppm failed.");
+        die("pgmramp|pgmtoppm failed.\n");
     }
     $widthRemaining -= $w;
     $n++;


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- netpbm.spec	26 Feb 2009 05:21:45 -0000	1.133
+++ netpbm.spec	27 Feb 2009 08:45:01 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.35.60
-Release: 2%{?dist}
+Release: 3%{?dist}
 # See copyright_summary for details
 License: BSD and GPLv2 and IJG and MIT and Public Domain
 Group: System Environment/Libraries
@@ -35,6 +35,8 @@
 Patch23: netpbm-10.35-pnmtofiasco-stdin.patch
 Patch24: netpbm-10.35-64bitfix.patch
 Patch25: netpbm-10.35-ximtoppmsegfault.patch
+Patch26: netpbm-10.35-ppmfadeusage.patch
+Patch27: netpbm-10.35-ppmrainbowexit.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
 BuildRequires: libX11-devel, python, jasper-devel
@@ -100,6 +102,8 @@
 %patch23 -p1 -b .pnmtofiasco-stdin
 %patch24 -p1 -b .64bitfix
 %patch25 -p1 -b .ximtoppmsegfault
+%patch26 -p1 -b .ppmfadeusage
+%patch27 -p1 -b .ppmrainbowexit
 
 %build
 ./configure <<EOF
@@ -216,6 +220,7 @@
 %{_includedir}/*.h
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
+
 %files progs
 %defattr(-,root,root)
 %{_bindir}/*
@@ -224,6 +229,10 @@
 %{_datadir}/netpbm/
 
 %changelog
+* Thu Feb 26 2009 Jindrich Novy <jnovy at redhat.com> 10.35.60-3
+- fix broken perl syntax in ppmfade
+- fix exit status and error reporting in ppmrainbow
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.35.60-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild