|
@@ -1,56 +1,47 @@
|
|
|
-Summary: A library for handling different graphics file formats.
|
|
|
-Summary(ja): 異なる画像ファイル形式を取り扱うためのライブラリ
|
|
|
-Name: netpbm
|
|
|
-Version: 10.61.02
|
|
|
-Release: 2%{?_dist_release}
|
|
|
-License: Artistic License/GPL/MIT
|
|
|
-Group: System Environment/Libraries
|
|
|
-Source0: netpbm-%{version}.tar.xz
|
|
|
-Source3: jpeg-to-pnm.fpi
|
|
|
-Source4: pnm-to-ps.fpi
|
|
|
-Source5: bmp-to-pnm.fpi
|
|
|
-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
|
|
|
+Summary: A library for handling different graphics file formats.
|
|
|
+Summary(ja): 異なる画像ファイル形式を取り扱うためのライブラリ
|
|
|
+Name: netpbm
|
|
|
+Version: 10.86.16
|
|
|
+Release: 1%{?_dist_release}
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+Group: system
|
|
|
+
|
|
|
+# See copyright_summary for details
|
|
|
+License: BSD and GPLv2 and IJG and MIT and Public Domain
|
|
|
+URL: https://netpbm.sourceforge.net/
|
|
|
+Source0: netpbm-%{version}.tar.xz
|
|
|
# Patches from fedora core
|
|
|
-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
|
|
|
-Patch13: netpbm-glibc.patch
|
|
|
-Patch15: netpbm-docfix.patch
|
|
|
-Patch16: netpbm-ppmfadeusage.patch
|
|
|
-Patch17: netpbm-fiasco-overflow.patch
|
|
|
-Patch20: netpbm-noppmtompeg.patch
|
|
|
-Patch21: netpbm-cmuwtopbm.patch
|
|
|
-Patch22: netpbm-pamtojpeg2k.patch
|
|
|
-Patch23: netpbm-manfix.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
|
|
|
+Patch0: netpbm-security-scripts.patch
|
|
|
+#Patch1: netpbm-security-code.patch
|
|
|
+Patch2: netpbm-ppmfadeusage.patch
|
|
|
+Patch3: netpbm-CVE-2017-2587.patch
|
|
|
+Patch4: netpbm-python3.patch
|
|
|
+Patch5: netpbm-time.patch
|
|
|
+Patch6: netpbm-gcc4.patch
|
|
|
+Patch7: netpbm-bmptopnm.patch
|
|
|
+Patch8: netpbm-CAN-2005-2471.patch
|
|
|
+Patch9: netpbm-xwdfix.patch
|
|
|
+Patch10: netpbm-multilib.patch
|
|
|
+Patch11: netpbm-glibc.patch
|
|
|
+#Patch12: netpbm-docfix.patch
|
|
|
+Patch13: netpbm-fiasco-overflow.patch
|
|
|
+Patch14: netpbm-cmuwtopbm.patch
|
|
|
+Patch15: netpbm-pamtojpeg2k.patch
|
|
|
+#Patch16: netpbm-manfix.patch
|
|
|
+#Patch17: netpbm-manual-pages.patch
|
|
|
+Patch18: netpbm-jasper.patch
|
|
|
+#Patch19: netpbm-userguide.patch
|
|
|
+Patch20: netpbm-libdir-so.patch
|
|
|
|
|
|
#Security fix
|
|
|
|
|
|
-
|
|
|
-URL: http://netpbm.sourceforge.net/
|
|
|
-Buildroot: %{_tmppath}/%{name}-root
|
|
|
-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
|
|
|
-Distribution: Vine Linux
|
|
|
+BuildRoot: %{_tmppath}/%{name}-root
|
|
|
+BuildRequires: libjpeg-devel, libtiff-devel, zlib-devel, jasper-devel
|
|
|
+BuildRequires: libpng-devel, libX11-devel, libxml2-devel
|
|
|
+BuildRequires: flex, python, perl
|
|
|
+BuildRequires: ghostscript
|
|
|
+Obsoletes: libgr
|
|
|
|
|
|
%description
|
|
|
The netpbm package contains a library of functions which support
|
|
@@ -58,10 +49,11 @@ programs for handling various graphics file formats, including .pbm
|
|
|
(portable bitmaps), .pgm (portable graymaps), .pnm (portable anymaps),
|
|
|
.ppm (portable pixmaps) and others.
|
|
|
|
|
|
+
|
|
|
%package devel
|
|
|
Summary: Development tools for programs which will use the netpbm libraries.
|
|
|
Summary(ja): netpbm ライブラリを使うプログラムの開発ツール
|
|
|
-Group: Development/Libraries
|
|
|
+Group: programming
|
|
|
Requires: netpbm = %{version}-%{release}
|
|
|
Obsoletes: libgr-devel
|
|
|
|
|
@@ -74,10 +66,11 @@ Install netpbm-devel if you want to develop programs for handling the
|
|
|
graphics file formats supported by the netpbm libraries. You will also
|
|
|
need to have the netpbm package installed.
|
|
|
|
|
|
+
|
|
|
%package progs
|
|
|
Summary: Tools for manipulating graphics files in netpbm supported formats.
|
|
|
Summary(ja): netpbm でサポートするフォーマットの画像ファイルを操作するツール
|
|
|
-Group: Applications/Graphics
|
|
|
+Group: graphics
|
|
|
Requires: netpbm = %{version}-%{release}
|
|
|
Requires: libpng libtiff libjpeg zlib perl bash
|
|
|
Obsoletes: libgr-progs
|
|
@@ -92,11 +85,12 @@ 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
|
|
|
+Group: documentation
|
|
|
Requires: netpbm-progs = %{version}-%{release}
|
|
|
|
|
|
%description doc
|
|
@@ -106,32 +100,14 @@ 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.
|
|
|
|
|
|
+
|
|
|
+%debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
-%setup -q
|
|
|
-%patch1 -p1 -b .time
|
|
|
-%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
|
|
|
-%patch13 -p1 -b .glibc
|
|
|
-%patch15 -p1
|
|
|
-%patch16 -p1 -b .ppmfadeusage
|
|
|
-%patch17 -p1 -b .fiasco-overflow
|
|
|
-%patch20 -p1 -b .noppmtompeg
|
|
|
-%patch21 -p1 -b .cmuwtopbmfix
|
|
|
-%patch22 -p1 -b .pamtojpeg2kfix
|
|
|
-%patch23 -p1 -b .manfix
|
|
|
-%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
|
|
|
+%autosetup -p1
|
|
|
+rm -rf converter/other/jpeg2000/libjasper/
|
|
|
+
|
|
|
|
|
|
%build
|
|
|
[ ! -f "/tmp/netpbm" ] && rm -rf /tmp/netpbm
|
|
@@ -153,6 +129,8 @@ netpbm-doc. You'll also need to install the netpbm-progs package.
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
%ifnarch %{ix86}
|
|
|
|
|
|
%endif
|
|
@@ -161,8 +139,9 @@ EOF
|
|
|
TOP=`pwd`
|
|
|
make \
|
|
|
CC=%{__cc} \
|
|
|
- CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \
|
|
|
LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
|
|
|
+ CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \
|
|
|
+ CFLAGS_CONFIG="$RPM_OPT_FLAGS" \
|
|
|
LADD="-lm" \
|
|
|
JPEGINC_DIR=%{_includedir} \
|
|
|
PNGINC_DIR=%{_includedir} \
|
|
@@ -170,7 +149,7 @@ make \
|
|
|
JPEGLIB_DIR=%{_libdir} \
|
|
|
PNGLIB_DIR=%{_libdir} \
|
|
|
TIFFLIB_DIR=%{_libdir} \
|
|
|
- LINUXSVGALIB=NONE \
|
|
|
+ LINUXSVGALIB="NONE" \
|
|
|
X11LIB=%{_libdir}/libX11.so \
|
|
|
XML2LIBS="NONE" \
|
|
|
JASPERLIB="" \
|
|
@@ -194,24 +173,22 @@ done
|
|
|
|
|
|
%install
|
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
|
|
-
|
|
|
mkdir -p $RPM_BUILD_ROOT
|
|
|
-make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"
|
|
|
+make package pkgdir=%{buildroot}/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"
|
|
|
|
|
|
# Ugly hack to have libs in correct dir on 64bit archs.
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
|
|
|
+mkdir -p %{buildroot}%{_libdir}
|
|
|
if [ "%{_libdir}" != "/usr/lib" ]; then
|
|
|
- mv $RPM_BUILD_ROOT/usr/lib/lib* $RPM_BUILD_ROOT%{_libdir}
|
|
|
+ mv %{buildroot}/usr/lib/lib* %{buildroot}%{_libdir}
|
|
|
fi
|
|
|
|
|
|
-cp -af lib/libnetpbm.a $RPM_BUILD_ROOT%{_libdir}/libnetpbm.a
|
|
|
-cp -l $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so.?? $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so
|
|
|
+cp -af lib/libnetpbm.a %{buildroot}%{_libdir}/libnetpbm.a
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_datadir}
|
|
|
-mv userguide/man $RPM_BUILD_ROOT%{_mandir}
|
|
|
+mkdir -p %{buildroot}%{_datadir}
|
|
|
+mv userguide/man %{buildroot}%{_mandir}
|
|
|
|
|
|
# Get rid of the useless non-ascii character in pgmminkowski.1
|
|
|
-sed -i 's/\xa0//' $RPM_BUILD_ROOT%{_mandir}/man1/pgmminkowski.1
|
|
|
+sed -i 's/\xa0//' %{buildroot}%{_mandir}/man1/pgmminkowski.1
|
|
|
|
|
|
# Don't ship man pages for non-existent binaries and bogus ones
|
|
|
for i in hpcdtoppm \
|
|
@@ -219,53 +196,57 @@ for i in hpcdtoppm \
|
|
|
directory error extendedopacity \
|
|
|
pam pbm pgm pnm ppm index libnetpbm_dir \
|
|
|
liberror ppmtotga; do
|
|
|
- rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1
|
|
|
+ rm -f %{buildroot}%{_mandir}/man1/${i}.1
|
|
|
done
|
|
|
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5
|
|
|
-
|
|
|
-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
|
|
|
-rm -rf $RPM_BUILD_ROOT/usr/misc
|
|
|
-rm -rf $RPM_BUILD_ROOT/usr/man
|
|
|
-rm -rf $RPM_BUILD_ROOT/usr/pkginfo
|
|
|
-rm -rf $RPM_BUILD_ROOT/usr/config_template
|
|
|
+rm -f %{buildroot}%{_mandir}/man5/extendedopacity.5
|
|
|
+
|
|
|
+mkdir -p %{buildroot}%{_datadir}/netpbm
|
|
|
+mv %{buildroot}/usr/misc/*.map %{buildroot}%{_datadir}/netpbm/
|
|
|
+mv %{buildroot}/usr/misc/rgb.txt %{buildroot}%{_datadir}/netpbm/
|
|
|
+rm -rf %{buildroot}/usr/README
|
|
|
+rm -rf %{buildroot}/usr/VERSION
|
|
|
+rm -rf %{buildroot}/usr/link
|
|
|
+rm -rf %{buildroot}/usr/misc
|
|
|
+rm -rf %{buildroot}/usr/man
|
|
|
+rm -rf %{buildroot}/usr/pkginfo
|
|
|
+rm -rf %{buildroot}/usr/config_template
|
|
|
+rm -rf %{buildroot}/usr/pkgconfig_template
|
|
|
|
|
|
# Don't ship the static library
|
|
|
-rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*.a
|
|
|
+rm -f %{buildroot}%{_libdir}/lib*.a
|
|
|
|
|
|
# remove/symlink/substitute obsolete utilities
|
|
|
-pushd $RPM_BUILD_ROOT%{_bindir}
|
|
|
+pushd %{buildroot}%{_bindir}
|
|
|
rm -f pgmtopbm pnmcomp
|
|
|
ln -s pamcomp pnmcomp
|
|
|
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}
|
|
|
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
|
|
|
+export PBM_TESTPREFIX=%{buildroot}%{_bindir}
|
|
|
+export PBM_BINPREFIX=%{buildroot}%{_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
|
|
|
-/sbin/ldconfig
|
|
|
|
|
|
-%postun
|
|
|
-/sbin/ldconfig
|
|
|
+%post -p /sbin/ldconfig
|
|
|
+%postun -p /sbin/ldconfig
|
|
|
+
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
-%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
|
|
|
+%license doc/GPL_LICENSE.txt
|
|
|
+%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/HISTORY README
|
|
|
%{_libdir}/lib*.so.*
|
|
|
|
|
|
%files devel
|
|
@@ -286,7 +267,12 @@ popd
|
|
|
%defattr(-,root,root)
|
|
|
%doc userguide/*
|
|
|
|
|
|
+
|
|
|
%changelog
|
|
|
+* Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.86.16-1
|
|
|
+- new upstream release.
|
|
|
+- re-imported all patches from RawHide.
|
|
|
+
|
|
|
* Sat Jul 19 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 10.61.02-2
|
|
|
- rebuild with libpng-1.6.12
|
|
|
|