rpms/netpbm/F-13 netpbm-ppmfadeusage.patch, 1.1, 1.2 netpbm.spec, 1.155, 1.156
Jindrich Novy
jnovy at fedoraproject.org
Fri Feb 19 08:50:34 UTC 2010
Author: jnovy
Update of /cvs/pkgs/rpms/netpbm/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1750
Modified Files:
netpbm-ppmfadeusage.patch netpbm.spec
Log Message:
* Wed Feb 17 2010 Jindrich Novy <jnovy at redhat.com> 10.47.09-3
- remove obsolete pgmtopbm and pnmcomp, symlink them to the new
compatible variants
- fix ppmfade -h, --help options
- add missing man pages
- link against -lz (#564649)
netpbm-ppmfadeusage.patch:
ppmfade | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
Index: netpbm-ppmfadeusage.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-13/netpbm-ppmfadeusage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- netpbm-ppmfadeusage.patch 25 Jan 2010 08:42:36 -0000 1.1
+++ netpbm-ppmfadeusage.patch 19 Feb 2010 08:50:34 -0000 1.2
@@ -1,15 +1,15 @@
-diff -up netpbm-10.47.05/editor/ppmfade.ppmfadeusage netpbm-10.47.05/editor/ppmfade
---- netpbm-10.47.05/editor/ppmfade.ppmfadeusage 2010-01-21 05:36:00.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmfade 2010-01-21 05:40:32.000000000 +0100
-@@ -34,6 +34,7 @@ my $base_name = "fade"; # default base
+diff -up netpbm-10.47.09/editor/ppmfade.ppmfadeusage netpbm-10.47.09/editor/ppmfade
+--- netpbm-10.47.09/editor/ppmfade.ppmfadeusage 2010-02-17 11:22:02.000000000 +0100
++++ netpbm-10.47.09/editor/ppmfade 2010-02-17 11:27:29.000000000 +0100
+@@ -34,7 +34,6 @@ my $base_name = "fade"; # default base
my $image = "ppm"; # default output storage format
my $mode = $SPREAD; # default fading mode
-+sub usage();
-
+-
my $n; # argument number
-@@ -44,7 +45,7 @@ for ($n = 0; $n < @ARGV; $n++) {
+ for ($n = 0; $n < @ARGV; $n++) {
+@@ -44,7 +43,7 @@ for ($n = 0; $n < @ARGV; $n++) {
if (-e $first_file) {
} else {
print "I can't find first file '$first_file'\n";
@@ -18,7 +18,7 @@ diff -up netpbm-10.47.05/editor/ppmfade.
}
} elsif ($ARGV[$n] eq "-l") {
$n++;
-@@ -52,7 +53,7 @@ for ($n = 0; $n < @ARGV; $n++) {
+@@ -52,7 +51,7 @@ for ($n = 0; $n < @ARGV; $n++) {
if (-e $last_file) {
} else {
print "I can't find last file '$last_file'\n";
@@ -27,8 +27,15 @@ diff -up netpbm-10.47.05/editor/ppmfade.
}
} elsif ($ARGV[$n] eq "-base") {
$n++;
-@@ -77,7 +78,7 @@ for ($n = 0; $n < @ARGV; $n++) {
- usage();
+@@ -73,11 +72,12 @@ for ($n = 0; $n < @ARGV; $n++) {
+ $mode = $BLOCK;
+ } elsif ("$ARGV[$n]" eq "-mix") {
+ $mode = $MIX;
+- } elsif ($ARGV[$n] eq "-help" || $ARGV[$n] eq "-h") {
+- usage();
++ } elsif ($ARGV[$n] eq "-help" || $ARGV[$n] eq "--help" || $ARGV[$n] eq "-h") {
++ print "ppmfade: Use 'man ppmfade' for help.\n";
++ exit 1;
} else {
print "Unknown argument: $ARGV[$n]\n";
- exit 100;
@@ -36,7 +43,7 @@ diff -up netpbm-10.47.05/editor/ppmfade.
}
}
#
-@@ -96,18 +97,18 @@ if ($first_file ne "undefined") {
+@@ -96,18 +96,18 @@ if ($first_file ne "undefined") {
$width = $1; $height = $2;
} else {
print("Unrecognized results from pnmfile on $first_file.\n");
Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/F-13/netpbm.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- netpbm.spec 27 Jan 2010 10:45:52 -0000 1.155
+++ netpbm.spec 19 Feb 2010 08:50:34 -0000 1.156
@@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats
Name: netpbm
Version: 10.47.09
-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
@@ -28,6 +28,7 @@ Patch14: netpbm-svgtopam.patch
Patch15: netpbm-docfix.patch
Patch16: netpbm-ppmfadeusage.patch
Patch17: netpbm-fiasco-overflow.patch
+Patch18: netpbm-lz.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 .docfix
%patch16 -p1 -b .ppmfadeusage
%patch17 -p1 -b .fiasco-overflow
+%patch18 -p1 -b .lz
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
@@ -163,8 +165,7 @@ mv userguide/man $RPM_BUILD_ROOT%{_mandi
sed -i 's/\xa0//' $RPM_BUILD_ROOT%{_mandir}/man1/pgmminkowski.1
# Don't ship man pages for non-existent binaries and bogus ones
-for i in hpcdtoppm pcdovtoppm pnmtojbig \
- ppmsvgalib vidtoppm picttoppm jbigtopnm \
+for i in hpcdtoppm ppmsvgalib vidtoppm picttoppm \
directory error extendedopacity \
pam pbm pgm pnm ppm index libnetpbm_dir \
liberror pambackground pamfixtrunc \
@@ -187,6 +188,13 @@ rm -rf $RPM_BUILD_ROOT/usr/config_templa
# Don't ship the static library
rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*.a
+# remove/symlink obsolete utilities
+pushd $RPM_BUILD_ROOT%{_bindir}
+rm -f pgmtopbm pnmcomp
+ln -s pamditherbw pgmtopbm
+ln -s pamcomp pnmcomp
+popd
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -214,6 +222,13 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/netpbm/
%changelog
+* Wed Feb 17 2010 Jindrich Novy <jnovy at redhat.com> 10.47.09-3
+- remove obsolete pgmtopbm and pnmcomp, symlink them to the new
+ compatible variants
+- fix ppmfade -h, --help options
+- add missing man pages
+- link against -lz (#564649)
+
* Wed Jan 27 2010 Jindrich Novy <jnovy at redhat.com> 10.47.09-2
- fix buffer overflow in pnmtofiasco
More information about the scm-commits
mailing list