rpms/netpbm/F-7 netpbm-10.35-gcc43.patch, NONE, 1.1 netpbm-10.35-rgbtxt.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 netpbm-10.23-security.patch, 1.17, 1.18 netpbm.spec, 1.90, 1.91 sources, 1.30, 1.31
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Tue Apr 1 09:14:08 UTC 2008
- Previous message: rpms/mod_suphp/EL-4 README.fedora, NONE, 1.1 mod_suphp.conf, NONE, 1.1 mod_suphp.spec, 1.6, 1.7
- Next message: rpms/gcdmaster/devel gcdmaster-1.2.2-sigc2.patch, NONE, 1.1 gcdmaster.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/extras/rpms/netpbm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2950
Modified Files:
.cvsignore netpbm-10.23-security.patch netpbm.spec sources
Added Files:
netpbm-10.35-gcc43.patch netpbm-10.35-rgbtxt.patch
Log Message:
* Mon Mar 31 2008 Jindrich Novy <jnovy at redhat.com> 10.35.41-1
- update to 10.35.41 (fixes pnmnorm, pgmdeshadow, pgmmedian,
pgmbentley and pamtosvg, pamtosvg, pbmtext, ppmtoarbtxt and
gcc-4.3 build)
- package rgb.txt for pnmtopng (#313301)
- drop useless xorg-x11-server-utils BR
- fix to let it built with gcc 4.3
- sync security patch and fix typos
netpbm-10.35-gcc43.patch:
--- NEW FILE netpbm-10.35-gcc43.patch ---
diff -up netpbm-10.35.36/lib/libpbm3.c.gcc43 netpbm-10.35.36/lib/libpbm3.c
--- netpbm-10.35.36/lib/libpbm3.c.gcc43 2007-12-31 07:02:07.000000000 +0100
+++ netpbm-10.35.36/lib/libpbm3.c 2008-01-08 13:08:52.000000000 +0100
@@ -105,7 +105,7 @@ packBitsWithMmxSse(FILE * const
) ];
*/
- typedef int v8qi __attribute__ ((mode(V8QI)));
+ typedef int v8qi __attribute__ ((vector_size(8)));
typedef int di __attribute__ ((mode(DI)));
di const zero64 = 0; /* to clear with PXOR */
netpbm-10.35-rgbtxt.patch:
--- NEW FILE netpbm-10.35-rgbtxt.patch ---
diff -up netpbm-10.35.40/pm_config.in.h.rgbtxt netpbm-10.35.40/pm_config.in.h
--- netpbm-10.35.40/pm_config.in.h.rgbtxt 2008-03-09 11:28:32.000000000 +0100
+++ netpbm-10.35.40/pm_config.in.h 2008-03-14 12:27:28.000000000 +0100
@@ -67,9 +67,9 @@
#define RGB_DB2 "PBMplus_Dir:RGB.TXT"
#define RGB_DB3 "PBMplus_Dir:RGB.TXT"
#else
-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
-#define RGB_DB2 "/usr/share/X11/rgb.txt"
-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
+#define RGB_DB1 "/usr/share/netpbm/rgb.txt"
+#define RGB_DB2 "/usr/lib/X11/rgb.txt"
+#define RGB_DB3 "/usr/share/X11/rgb.txt"
#endif
/* CONFIGURE: This is the name of an environment variable that tells
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-7/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 18 Sep 2006 11:55:07 -0000 1.25
+++ .cvsignore 1 Apr 2008 09:13:30 -0000 1.26
@@ -1,28 +1 @@
-netpbm-nojbig-10.24.tar.bz2
-netpbmdoc-nojbig-10.24.tar.bz2
-netpbm-nojbig-10.25.tar.bz2
-netpbmdoc-nojbig-10.25.tar.bz2
-netpbm-nojbig-10.26.tar.bz2
-netpbmdoc-nojbig-10.26.tar.bz2
-netpbm-10.26.4.tar.bz2
-netpbmdoc-10.26.4.tar.bz2
-netpbm-10.27.tar.bz2
-netpbmdoc-10.27.tar.bz2
-netpbm-10.28.tar.bz2
-netpbmdoc-10.28.tar.bz2
-netpbm-10.29.tar.bz2
-netpbmdoc-10.29.tar.bz2
-netpbmdoc-10.30.tar.bz2
-netpbm-10.30.tar.bz2
-netpbmdoc-10.31.tar.bz2
-netpbm-10.31.tar.bz2
-netpbm-10.32.tar.bz2
-netpbmdoc-10.32.tar.bz2
-netpbm-10.33.tar.bz2
-netpbmdoc-10.33.tar.bz2
-netpbmdoc-10.34.tar.bz2
-netpbm-10.34.tar.bz2
-netpbm-10.34.l1.tar.bz2
-netpbmdoc-10.34.l1.tar.bz2
-netpbm-10.35.l1.tar.bz2
-netpbmdoc-10.35.l1.tar.bz2
+netpbm-10.35.41.tar.bz2
netpbm-10.23-security.patch:
Index: netpbm-10.23-security.patch
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-7/netpbm-10.23-security.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- netpbm-10.23-security.patch 19 Dec 2006 13:47:12 -0000 1.17
+++ netpbm-10.23-security.patch 1 Apr 2008 09:13:30 -0000 1.18
@@ -1128,20 +1128,6 @@
*padrightP =
( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
*bits_per_itemP = 16;
-@@ -223,9 +226,13 @@
- *formatP = PGM_TYPE;
- *visualclassP = StaticGray;
- *maxvalP = ( 1 << h10P->display_planes ) - 1;
-+ overflow_add(*maxvalP, 1);
- *colorsP = pnm_allocrow( *maxvalP + 1 );
- for ( i = 0; i <= *maxvalP; ++i )
- PNM_ASSIGN1( (*colorsP)[i], i );
-+ overflow_add(h10P->pixmap_width, 15);
-+ if(h10P->pixmap_width < 0)
-+ pm_error("assert: negative width");
- *padrightP =
- ( ( h10P->pixmap_width + 15 ) / 16 ) * 16 - h10P->pixmap_width;
- *bits_per_itemP = 16;
@@ -544,6 +551,7 @@
*colsP = h11FixedP->pixmap_width;
Index: netpbm.spec
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-7/netpbm.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- netpbm.spec 9 Dec 2007 18:00:48 -0000 1.90
+++ netpbm.spec 1 Apr 2008 09:13:30 -0000 1.91
@@ -1,13 +1,13 @@
Summary: A library for handling different graphics file formats
Name: netpbm
-Version: 10.35.32
-Release: 2%{?dist}
+Version: 10.35.41
+Release: 1%{?dist}
License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/
-# Source0 is prepared by
-# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{nersion}
-# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{nersion}/userguide
+# 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/userguide netpbm-%{version}/userguide
# and removing the .svn directories
Source0: netpbm-%{version}.tar.bz2
Patch1: netpbm-10.17-time.patch
@@ -27,9 +27,11 @@
Patch16: netpbm-10.35-pbmtog3segfault.patch
Patch17: netpbm-10.35-pbmtomacp.patch
Patch18: netpbm-10.35-glibc.patch
+Patch19: netpbm-10.35-gcc43.patch
+Patch20: netpbm-10.35-rgbtxt.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
-BuildRequires: libX11-devel xorg-x11-server-utils python
+BuildRequires: libX11-devel, python
%description
The netpbm package contains a library of functions which support
@@ -85,6 +87,8 @@
%patch16 -p1 -b .pbmtog3segfault
%patch17 -p1 -b .pbmtomacp
%patch18 -p1 -b .glibc
+%patch19 -p1 -b .gcc43
+%patch20 -p1 -b .rgbtxt
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -173,6 +177,7 @@
mkdir -p $RPM_BUILD_ROOT%{_datadir}/netpbm
mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_datadir}/netpbm/
+mv $RPM_BUILD_ROOT/usr/misc/rgb.txt $RPM_BUILD_ROOT%{_datadir}/netpbm/
rm -rf $RPM_BUILD_ROOT/usr/README
rm -rf $RPM_BUILD_ROOT/usr/VERSION
rm -rf $RPM_BUILD_ROOT/usr/link
@@ -209,14 +214,23 @@
%{_datadir}/netpbm/
%changelog
+* Mon Mar 31 2008 Jindrich Novy <jnovy at redhat.com> 10.35.41-1
+- update to 10.35.41 (fixes pnmnorm, pgmdeshadow, pgmmedian,
+ pgmbentley and pamtosvg, pamtosvg, pbmtext, ppmtoarbtxt and
+ gcc-4.3 build)
+- package rgb.txt for pnmtopng (#313301)
+- drop useless xorg-x11-server-utils BR
+- fix to let it built with gcc 4.3
+- sync security patch and fix typos
+
* Wed Nov 2 2007 Jindrich Novy <jnovy at redhat.com> 10.35.32-2
-- remove man pages that lack corresponding binaries (#417131)
+- remove man pages that lack corresponding binaries (#220739)
* Thu Oct 18 2007 Jindrich Novy <jnovy at redhat.com> 10.35.32-1
- remove .svn directories from tarball to reduce its size
- update fixes rhbz#337181 and likely others
-* Thu Oct 18 2007 MATSUURA Takanori <t.matsuu at gmail.com> - 10.35.32-0
+* Thu Oct 18 2007 MATSUURA Takanori <t.matsuu at gmail.com> 10.35.32-0
- update to 10.35.32 from svn tree
- create man pages from userguide HTML files
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-7/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 18 Oct 2007 10:51:18 -0000 1.30
+++ sources 1 Apr 2008 09:13:30 -0000 1.31
@@ -1 +1 @@
-d816dd084194f2e7ccf7ab97ee89b155 netpbm-10.35.32.tar.bz2
+41c78be399bbf244a3f0f11f55231a90 netpbm-10.35.41.tar.bz2
- Previous message: rpms/mod_suphp/EL-4 README.fedora, NONE, 1.1 mod_suphp.conf, NONE, 1.1 mod_suphp.spec, 1.6, 1.7
- Next message: rpms/gcdmaster/devel gcdmaster-1.2.2-sigc2.patch, NONE, 1.1 gcdmaster.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list