rpms/netpbm/F-7 netpbm-10.35-glibc.patch, NONE, 1.1 netpbm-10.27-bmptopnm.patch, 1.4, 1.5 netpbm.spec, 1.88, 1.89 netpbm-10.22-cmapsize.patch, 1.1, NONE
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Thu Oct 18 10:45:03 UTC 2007
Author: jnovy
Update of /cvs/extras/rpms/netpbm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25871
Modified Files:
netpbm-10.27-bmptopnm.patch netpbm.spec
Added Files:
netpbm-10.35-glibc.patch
Removed Files:
netpbm-10.22-cmapsize.patch
Log Message:
* 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
- update to 10.35.32 from svn tree
- create man pages from userguide HTML files
netpbm-10.35-glibc.patch:
--- NEW FILE netpbm-10.35-glibc.patch ---
--- netpbm-10.35/converter/other/pnmtotiffcmyk.c.glibc 2006-09-18 12:20:06.000000000 +0200
+++ netpbm-10.35/converter/other/pnmtotiffcmyk.c 2007-08-23 09:18:30.000000000 +0200
@@ -974,8 +974,8 @@ int main( int argc, char **argv ) {
if ( (err = parseOpts( argc, argv, rt )) ) goto exit ;
- if ( (err = rt->in->open( rt->in, rt )) ) goto exit ;
- if ( (err = rt->out->open( rt->out, rt )) ) goto exit ;
+ if ( (err = (rt->in->open)( rt->in, rt )) ) goto exit ;
+ if ( (err = (rt->out->open)( rt->out, rt )) ) goto exit ;
while ( rt->in->hasMore( rt->in ) ) {
if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;
netpbm-10.27-bmptopnm.patch:
Index: netpbm-10.27-bmptopnm.patch
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-7/netpbm-10.27-bmptopnm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- netpbm-10.27-bmptopnm.patch 29 Jan 2007 12:50:54 -0000 1.4
+++ netpbm-10.27-bmptopnm.patch 18 Oct 2007 10:44:58 -0000 1.5
@@ -9,11 +9,3 @@
unsigned int pos;
/* Current byte position in the BMP file */
-@@ -1278,7 +1278,6 @@ readBmp(FILE * const ifP,
- BMPreadfileheader(ifP, &bytesRead, &offBits);
- pos += bytesRead;
- }
-- if(BMPheader.cmapsize != 0)
- {
- unsigned int bytesRead;
- BMPreadinfoheader(ifP, &bytesRead, &BMPheader);
Index: netpbm.spec
===================================================================
RCS file: /cvs/extras/rpms/netpbm/F-7/netpbm.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- netpbm.spec 29 Mar 2007 15:06:19 -0000 1.88
+++ netpbm.spec 18 Oct 2007 10:44:58 -0000 1.89
@@ -1,17 +1,19 @@
Summary: A library for handling different graphics file formats
Name: netpbm
-Version: 10.35
-Release: 12%{?dist}
+Version: 10.35.32
+Release: 1%{?dist}
License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/
-Source0: netpbm-%{version}.l1.tar.bz2
-Source1: netpbmdoc-%{version}.l1.tar.bz2
+# 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
+# and removing the .svn directories
+Source0: netpbm-%{version}.tar.bz2
Patch1: netpbm-10.17-time.patch
Patch2: netpbm-9.24-strip.patch
Patch3: netpbm-10.19-message.patch
Patch4: netpbm-10.22-security2.patch
-Patch5: netpbm-10.22-cmapsize.patch
Patch6: netpbm-10.23-security.patch
Patch7: netpbm-10.24-nodoc.patch
Patch8: netpbm-10.28-gcc4.patch
@@ -24,9 +26,10 @@
Patch15: netpbm-10.35-ppmquantall.patch
Patch16: netpbm-10.35-pbmtog3segfault.patch
Patch17: netpbm-10.35-pbmtomacp.patch
+Patch18: netpbm-10.35-glibc.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
-BuildRequires: libX11-devel
+BuildRequires: libX11-devel xorg-x11-server-utils python
%description
The netpbm package contains a library of functions which support
@@ -69,7 +72,6 @@
%patch2 -p1 -b .strip
%patch3 -p1 -b .message
%patch4 -p1 -b .security2
-%patch5 -p1 -b .cmapsize
%patch6 -p1 -b .security
%patch7 -p1 -b .nodoc
%patch8 -p1 -b .gcc4
@@ -82,6 +84,7 @@
%patch15 -p1 -b .pqall
%patch16 -p1 -b .pbmtog3segfault
%patch17 -p1 -b .pbmtomacp
+%patch18 -p1 -b .glibc
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -125,6 +128,17 @@
X11LIB=%{_libdir}/libX11.so \
XML2LIBS="NONE"
+# prepare man files
+cd userguide
+for i in *.html ; do
+ ../buildtools/makeman ${i}
+done
+for i in 1 3 5 ; do
+ mkdir -p man/man${i}
+ mv *.${i} man/man${i}
+done
+
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -140,8 +154,8 @@
cp -af lib/libnetpbm.a $RPM_BUILD_ROOT%{_libdir}/libnetpbm.a
ln -sf libnetpbm.so.10 $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
-tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}
+mv userguide/man $RPM_BUILD_ROOT%{_mandir}
# Get rid of the useless non-ascii character in pgmminkowski.1
sed -i 's/\xa0//' $RPM_BUILD_ROOT%{_mandir}/man1/pgmminkowski.1
@@ -155,7 +169,8 @@
done
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5
-mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/netpbm
+mv $RPM_BUILD_ROOT/usr/misc/*.map $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
@@ -167,9 +182,6 @@
# Don't ship the static library
rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*.a
-# Don't ship the map files in %%{_libdir}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.map
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -179,7 +191,7 @@
%files
%defattr(-,root,root)
-%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
+%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README userguide
%{_libdir}/lib*.so.*
%files devel
@@ -192,8 +204,34 @@
%{_bindir}/*
%{_mandir}/man1/*
%{_mandir}/man5/*
+%{_datadir}/netpbm/
%changelog
+* 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
+- update to 10.35.32 from svn tree
+- create man pages from userguide HTML files
+
+* Thu Oct 11 2007 Jindrich Novy <jnovy at redhat.com> 10.35-17
+- add xorg-x11-server-utils BR (#313301)
+
+* Thu Aug 23 2007 Jindrich Novy <jnovy at redhat.com> 10.35-16
+- rebuild for ppc32
+- fix open() calls so that netpbm builds with new glibc
+
+* Mon Aug 20 2007 Jindrich Novy <jnovy at redhat.com> 10.35-15
+- fix .ppmquantall patch (#207799)
+- merge cmapsize with bmptopnm patch (#224554)
+
+* Mon Jul 16 2007 Jindrich Novy <jnovy at redhat.com> 10.35-14
+- /usr/share/netpbm is no more unowned (#248300)
+
+* Wed Jun 20 2007 Jindrich Novy <jnovy at redhat.com> 10.35-13
+- package map files needed by pnmtopalm (#244983)
+
* Thu Mar 29 2007 Jindrich Novy <jnovy at redhat.com> 10.35-12
- merge review fixes (#226191), thanks to Jason Tibbitts
--- netpbm-10.22-cmapsize.patch DELETED ---
More information about the fedora-extras-commits
mailing list