netpbm-10.47.27-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3535 ec354946-7b23-47d6-9f5a-488ba84defc7

n/netpbm/netpbm-vl.spec

@@ -1,11 +1,11 @@
 Summary: A library for handling different graphics file formats.
 Summary(ja): 異なる画像ファイル形式を取り扱うためのライブラリ
 Name: netpbm
-Version: 10.27
+Version: 10.47.27
 Release: 1%{?_dist_release}
 License: Artistic License/GPL/MIT
 Group: System Environment/Libraries
-Source0: netpbm-%{version}.tgz
+Source0: netpbm-%{version}.tar.xz
 Source3: jpeg-to-pnm.fpi
 Source4: pnm-to-ps.fpi
 Source5: bmp-to-pnm.fpi
@@ -13,35 +13,42 @@ Source6: gif-to-pnm.fpi
 Source7: rast-to-pnm.fpi
 Source8: tiff-to-pnm.fpi
 Source9: png-to-pnm.fpi
-Source10: netpbmdoc-%{version}.tar.bz2
+#Source10: netpbmdoc-%{version}.tar.bz2
 # Patches from fedora core
-Patch1: netpbm-10.17-time.patch
-Patch2: netpbm-9.24-strip.patch
-Patch3: netpbm-10.18-manpath.patch
-Patch4: netpbm-10.19-message.patch
-Patch5: netpbm-10.22-security2.patch
-Patch6: netpbm-10.22-cmapsize.patch
-Patch7: netpbm-10.23-gcc34.patch
-Patch8: netpbm-10.23-security.patch
-Patch9: netpbm-10.23-pngtopnm.patch
-Patch10: netpbm-10.24-nodoc.patch
-Patch11: netpbm-10.26.4-gcc4.patch
-Patch12: netpbm-10.27-badlink.patch
-
-Patch100: netpbm-10.27-rgb_db.patch
+Patch1: netpbm-time.patch
+Patch2: netpbm-message.patch
+Patch3: netpbm-security-scripts.patch
+Patch4: netpbm-security-code.patch
+Patch5: netpbm-nodoc.patch
+Patch6: netpbm-gcc4.patch
+Patch7: netpbm-bmptopnm.patch
+Patch8: netpbm-CAN-2005-2471.patch
+Patch9: netpbm-xwdfix.patch
+Patch11: netpbm-multilib.patch
+Patch12: netpbm-pamscale.patch
+Patch13: netpbm-glibc.patch
+Patch14: netpbm-svgtopam.patch
+Patch15: netpbm-docfix.patch
+Patch16: netpbm-ppmfadeusage.patch
+Patch17: netpbm-fiasco-overflow.patch
+Patch18: netpbm-lz.patch
+Patch19: netpbm-pnmmontagefix.patch
+Patch20: netpbm-noppmtompeg.patch
+Patch21: netpbm-cmuwtopbm.patch
+Patch22: netpbm-pamtojpeg2k.patch
+Patch23: netpbm-manfix.patch
+
 # bugfix
 Patch110: netpbm-10.27-pnmcolormap_segfault.patch
 
 #Security fix
-Patch200: netpbm-10.27-CVE-2005-2471.patch
-Patch210: netpbm-10.27-CVE-2005-2978.patch
-Patch220: netpbm-10.27-CVE-2005-3662.patch
+
 
 URL: http://netpbm.sourceforge.net/
 Buildroot: %{_tmppath}/%{name}-root
-BuildPrereq: libjpeg-devel, libtiff-devel, zlib-devel, perl
-BuildPrereq: libpng-devel >= 1.2.5
-BuildPrereq: flex
+BuildRequires: libjpeg-devel, libtiff-devel, zlib-devel, perl
+BuildRequires: libpng-devel >= 1.2.5, libX11-devel
+BuildRequires: flex
 Obsoletes: libgr
 
 Vendor: Project Vine
@@ -87,27 +94,47 @@ scripts for converting from one graphics file format to another.
 If you need to use these conversion scripts, you should install
 netpbm-progs.  You will also need to install the netpbm package.
 
+%package doc
+Summary: Documentation for manipulating graphics files with netpbm-progs formats
+
+Summary(ja): netpbm-progs による画像ファイル操作のドキュメント
+Group: Applications/Documentation
+Requires: netpbm-progs = %{version}-%{release}
+
+%description doc
+The netpbm-doc package contains a documentation in HTML format for utilities
+present in netpbm-progs package.
+
+If you need to look into the HTML documentation, you should install
+netpbm-doc.  You'll also need to install the netpbm-progs package.
+
 %prep
 %setup -q
 %patch1 -p1 -b .time
-%patch2 -p1 -b .strip
-%patch3 -p1 -b .manpath
-%patch4 -p1 -b .message
-%patch5 -p1 -b .security2
-%patch6 -p1 -b .cmapsize
-%patch7 -p1 -b .gcc34
-%patch8 -p1 -b .security
-%patch9 -p1 -b .pngtopnm
-%patch10 -p1 -b .nodoc
-%patch11 -p1 -b .gcc4
-%patch12 -p1 -b .badlink
-
-%patch100 -p1 -b .rgb_db
-%patch110 -p0 -b .pnmcolor_segfault
-
-%patch200 -p0 -b .CVE-2005-2471.patch
-%patch210 -p0 -b .CVE-2005-2978.patch
-%patch220 -p0 -b .CVE-2005-3662.patch
+%patch2 -p1 -b .message
+%patch3 -p1 -b .security-scripts
+%patch4 -p1 -b .security-code
+%patch5 -p1 -b .nodoc
+%patch6 -p1 -b .gcc4
+%patch7 -p1 -b .bmptopnm
+%patch8 -p1 -b .CAN-2005-2471
+%patch9 -p1 -b .xwdfix
+%patch11 -p1 -b .multilib
+%patch12 -p1 -b .pamscale
+%patch13 -p1 -b .glibc
+%patch14 -p1 -b .svgtopam
+%patch15 -p1
+%patch16 -p1 -b .ppmfadeusage
+%patch17 -p1 -b .fiasco-overflow
+%patch18 -p1 -b .lz
+%patch19 -p1 -b .pnmmmontagefix
+%patch20 -p1 -b .noppmtompeg
+%patch21 -p1 -b .cmuwtopbmfix
+%patch22 -p1 -b .pamtojpeg2kfix
+%patch23 -p1 -b .manfix
+
+##%patch110 -p0 -b .pnmcolor_segfault
+
 
 %build
 [ ! -f "/tmp/netpbm" ] && rm -rf /tmp/netpbm
@@ -137,17 +164,27 @@ EOF
 TOP=`pwd`
 make \
 	CC=%{__cc} \
-	CFLAGS="$RPM_OPT_FLAGS -fPIC" \
+	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \
 	LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
+	LADD="-lm" \
 	JPEGINC_DIR=%{_includedir} \
 	PNGINC_DIR=%{_includedir} \
 	TIFFINC_DIR=%{_includedir} \
 	JPEGLIB_DIR=%{_libdir} \
 	PNGLIB_DIR=%{_libdir} \
 	TIFFLIB_DIR=%{_libdir} \
-	LINUXSVGALIB=NONE
+	LINUXSVGALIB=NONE \
+	X11LIB=%{_libdir}/libX11.so
 
-##make package
+# 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
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -164,13 +201,22 @@ fi
 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 %{SOURCE10} -C $RPM_BUILD_ROOT%{_mandir}
+#mkdir -p $RPM_BUILD_ROOT%{_mandir}
+#tar jxvf %{SOURCE10} -C $RPM_BUILD_ROOT%{_mandir}
 
-# Don't ship man packages for non-existent binaries
-for i in hpcdtoppm.1 pcdovtoppm.1 pnmtojbig.1 \
-         ppmsvgalib.1 vidtoppm.1 picttoppm.1; do
-	 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}
+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
+
+# Don't ship man pages for non-existent binaries and bogus ones
+for i in hpcdtoppm \
+         ppmsvgalib vidtoppm picttoppm \
+         directory error extendedopacity \
+         pam pbm pgm pnm ppm index libnetpbm_dir \
+         liberror ppmtotga; do
+        rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1
 done
 
 mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir}
@@ -188,9 +234,22 @@ for filter in $RPM_SOURCE_DIR/*.fpi ; do
 	$RPM_BUILD_ROOT%{_libdir}/rhs/rhs-printfilters
 done
 
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 install lib/rgb.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/rgb.txt
 
+# Don't ship the static library
+rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*.a
+
+# remove/symlink/substitute obsolete utilities
+pushd $RPM_BUILD_ROOT%{_bindir}
+rm -f pgmtopbm pnmcomp
+ln -s pamcomp pnmcomp
+echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > pgmtopbm
+chmod 0755 pgmtopbm
+popd
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 # clean builddir
@@ -207,27 +266,37 @@ install lib/rgb.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/rgb.txt
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/*.h
-%{_libdir}/lib*.a
+%dir %{_includedir}/netpbm
+%{_includedir}/netpbm/*.h
 %{_libdir}/lib*.so
 %{_mandir}/man3/*
 
 %files progs
 %defattr(-,root,root)
 %{_bindir}/*
-%{_libdir}/rhs/rhs-printfilters/jpeg-to-pnm.fpi
-%{_libdir}/rhs/rhs-printfilters/pnm-to-ps.fpi
-%{_libdir}/rhs/rhs-printfilters/bmp-to-pnm.fpi
-%{_libdir}/rhs/rhs-printfilters/gif-to-pnm.fpi
-%{_libdir}/rhs/rhs-printfilters/rast-to-pnm.fpi
-%{_libdir}/rhs/rhs-printfilters/tiff-to-pnm.fpi
-%{_libdir}/rhs/rhs-printfilters/png-to-pnm.fpi
+#%{_libdir}/rhs/rhs-printfilters/jpeg-to-pnm.fpi
+#%{_libdir}/rhs/rhs-printfilters/pnm-to-ps.fpi
+#%{_libdir}/rhs/rhs-printfilters/bmp-to-pnm.fpi
+#%{_libdir}/rhs/rhs-printfilters/gif-to-pnm.fpi
+#%{_libdir}/rhs/rhs-printfilters/rast-to-pnm.fpi
+#%{_libdir}/rhs/rhs-printfilters/tiff-to-pnm.fpi
+#%{_libdir}/rhs/rhs-printfilters/png-to-pnm.fpi
 %{_libdir}/*.map
 %{_datadir}/%{name}/rgb.txt
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
+%files doc
+%defattr(-,root,root)
+%doc userguide/*
+
 %changelog
+* Mon Apr 18 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.47.27-1
+- new upstream release.
+- shipped all patches from Fedora development.
+- added a subpackage "netpbm-doc".
+- rebuilt with recent environment.
+
 * Sun Jul 27 2008 Shu KONNO <owa@bg.wakwak.com> 10.27-1vl5
 - applied new versioning policy and spec in utf-8