rpms/netpbm/F-8 netpbm-10.35-gcc43.patch, NONE, 1.1 netpbm-10.35-rgbtxt.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 netpbm.spec, 1.96, 1.97 sources, 1.30, 1.31
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Mon Mar 31 11:11:58 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/netpbm/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1101
Modified Files:
.cvsignore 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-8/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 18 Oct 2007 10:26:16 -0000 1.26
+++ .cvsignore 31 Mar 2008 11:11:21 -0000 1.27
@@ -1,29 +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.32.tar.bz2
+netpbm-10.35.41.tar.bz2
Index: netpbm.spec
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-8/netpbm.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- netpbm.spec 8 Nov 2007 17:34:01 -0000 1.96
+++ netpbm.spec 31 Mar 2008 11:11:21 -0000 1.97
@@ -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,6 +214,15 @@
%{_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 (#220739)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-8/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 18 Oct 2007 10:26:16 -0000 1.30
+++ sources 31 Mar 2008 11:11:21 -0000 1.31
@@ -1 +1 @@
-d816dd084194f2e7ccf7ab97ee89b155 netpbm-10.35.32.tar.bz2
+41c78be399bbf244a3f0f11f55231a90 netpbm-10.35.41.tar.bz2
More information about the fedora-extras-commits
mailing list