|
|
@@ -1,7 +1,7 @@
|
|
|
Summary: A library for handling different graphics file formats.
|
|
|
Summary(ja): 異なる画像ファイル形式を取り扱うためのライブラリ
|
|
|
Name: netpbm
|
|
|
-Version: 10.47.27
|
|
|
+Version: 10.61.02
|
|
|
Release: 1%{?_dist_release}
|
|
|
License: Artistic License/GPL/MIT
|
|
|
Group: System Environment/Libraries
|
|
|
@@ -25,30 +25,28 @@ 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
|
|
|
+Patch24: netpbm-ppmtopict.patch
|
|
|
+Patch25: netpbm-pnmtopclxl.patch
|
|
|
+Patch27: netpbm-multipage-pam.patch
|
|
|
+Patch28: netpbm-compare-same-images.patch
|
|
|
+Patch29: netpbm-manual-pages.patch
|
|
|
|
|
|
#Security fix
|
|
|
|
|
|
|
|
|
URL: http://netpbm.sourceforge.net/
|
|
|
Buildroot: %{_tmppath}/%{name}-root
|
|
|
-BuildRequires: libjpeg-devel, libtiff-devel, zlib-devel, perl
|
|
|
-BuildRequires: libpng-devel >= 1.2.5, libX11-devel
|
|
|
-BuildRequires: flex
|
|
|
+BuildRequires: libjpeg-devel, libtiff-devel, zlib-devel, jasper-devel
|
|
|
+BuildRequires: libpng-devel >= 1.2.5, libX11-devel, libxml2-devel
|
|
|
+BuildRequires: flex, python, perl
|
|
|
Obsoletes: libgr
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
@@ -120,21 +118,20 @@ netpbm-doc. You'll also need to install the netpbm-progs package.
|
|
|
%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
|
|
|
-
|
|
|
+%patch24 -p1 -b .ppmtopict
|
|
|
+%patch25 -p1 -b .pnmtopclxl
|
|
|
+%patch27 -p1 -b .multipage-pam
|
|
|
+%patch28 -p1 -b .compare-same-images
|
|
|
+#%patch29 -p1 -b .man-corrections
|
|
|
+%patch29 -p1 -b .manual-pages
|
|
|
|
|
|
%build
|
|
|
[ ! -f "/tmp/netpbm" ] && rm -rf /tmp/netpbm
|
|
|
@@ -174,10 +171,18 @@ make \
|
|
|
PNGLIB_DIR=%{_libdir} \
|
|
|
TIFFLIB_DIR=%{_libdir} \
|
|
|
LINUXSVGALIB=NONE \
|
|
|
- X11LIB=%{_libdir}/libX11.so
|
|
|
+ X11LIB=%{_libdir}/libX11.so \
|
|
|
+ XML2LIBS="NONE" \
|
|
|
+ JASPERLIB="" \
|
|
|
+ JASPERDEPLIBS="-ljasper" \
|
|
|
+ JASPERHDR_DIR="/usr/include/jasper"
|
|
|
|
|
|
# prepare man files
|
|
|
cd userguide
|
|
|
+# BZ 948531
|
|
|
+rm -f ppmtompeg*
|
|
|
+rm -f *.manual-pages
|
|
|
+rm -f *.manfix
|
|
|
for i in *.html ; do
|
|
|
../buildtools/makeman ${i}
|
|
|
done
|
|
|
@@ -186,11 +191,12 @@ for i in 1 3 5 ; do
|
|
|
mv *.${i} man/man${i}
|
|
|
done
|
|
|
|
|
|
+
|
|
|
%install
|
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT
|
|
|
-make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB=NONE
|
|
|
+make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"
|
|
|
|
|
|
# Ugly hack to have libs in correct dir on 64bit archs.
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_libdir}
|
|
|
@@ -199,10 +205,7 @@ if [ "%{_libdir}" != "/usr/lib" ]; then
|
|
|
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}
|
|
|
+cp -l $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so.?? $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}
|
|
|
mv userguide/man $RPM_BUILD_ROOT%{_mandir}
|
|
|
@@ -218,8 +221,11 @@ for i in hpcdtoppm \
|
|
|
liberror ppmtotga; do
|
|
|
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1
|
|
|
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/
|
|
|
+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
|
|
|
@@ -228,17 +234,6 @@ rm -rf $RPM_BUILD_ROOT/usr/man
|
|
|
rm -rf $RPM_BUILD_ROOT/usr/pkginfo
|
|
|
rm -rf $RPM_BUILD_ROOT/usr/config_template
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/rhs/rhs-printfilters
|
|
|
-for filter in $RPM_SOURCE_DIR/*.fpi ; do
|
|
|
- install -m755 $filter \
|
|
|
- $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
|
|
|
|
|
|
@@ -250,18 +245,27 @@ echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > pgmtopbm
|
|
|
chmod 0755 pgmtopbm
|
|
|
popd
|
|
|
|
|
|
+%check
|
|
|
+pushd test
|
|
|
+export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
|
|
|
+export PBM_TESTPREFIX=$RPM_BUILD_ROOT%{_bindir}
|
|
|
+./Execute-Tests && exit 0
|
|
|
+popd
|
|
|
+
|
|
|
%clean
|
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
|
|
# clean builddir
|
|
|
[ ! -f "/tmp/netpbm" ] && rm -rf /tmp/netpbm
|
|
|
|
|
|
-%post -p /sbin/ldconfig
|
|
|
+%post
|
|
|
+/sbin/ldconfig
|
|
|
|
|
|
-%postun -p /sbin/ldconfig
|
|
|
+%postun
|
|
|
+/sbin/ldconfig
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
-%doc README doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY doc/USERDOC
|
|
|
+%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
|
|
|
%{_libdir}/lib*.so.*
|
|
|
|
|
|
%files devel
|
|
|
@@ -274,23 +278,19 @@ popd
|
|
|
%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}/*.map
|
|
|
-%{_datadir}/%{name}/rgb.txt
|
|
|
%{_mandir}/man1/*
|
|
|
%{_mandir}/man5/*
|
|
|
+%{_datadir}/netpbm/
|
|
|
|
|
|
%files doc
|
|
|
%defattr(-,root,root)
|
|
|
%doc userguide/*
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jan 04 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.61.02-1
|
|
|
+- new upstream release.
|
|
|
+- shipped all patches from RawHide.
|
|
|
+
|
|
|
* Mon Apr 18 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.47.27-1
|
|
|
- new upstream release.
|
|
|
- shipped all patches from Fedora development.
|
|
|
@@ -437,7 +437,7 @@ popd
|
|
|
* Thu Jul 29 1999 Bill Nottingham <notting@redhat.com>
|
|
|
- add a pile of foo-to-bar.fpi filters (#4251)
|
|
|
|
|
|
-* Mon Mar 23 1999 Michael Johnson <johnsonm@redhat.com>
|
|
|
+* Tue Mar 23 1999 Michael Johnson <johnsonm@redhat.com>
|
|
|
- removed old png.h header file that was causing png utils to die
|
|
|
- build png in build instead of install section...
|
|
|
|
tomop