- release 2 (rebuild with jasper 2)

[packages/netpbm.git] / netpbm.spec

diff --git a/netpbm.spec b/netpbm.spec
index 13303fdc2799152662fe53409bab1743db34a43c..aceb285f64d27451c3e1e57f3afb8a3c9929aebb 100644 (file)
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -2,7 +2,7 @@
 # - documentation for progs: try to get some real man pages (old netpbm? Debian?)
 #
 # Conditional build:
-%bcond_with    svga    # don't build ppmsvgalib tool
+%bcond_with    svga    # build ppmsvgalib tool
 #
 Summary:       A library for handling different graphics file formats
 Summary(pl.UTF-8):     Biblioteki do obsługi różnych formatów graficznych
@@ -10,14 +10,14 @@ Summary(pt_BR.UTF-8):       Ferramentas para manipular arquivos graficos nos formatos
 Summary(ru.UTF-8):     Набор библиотек для работы с различными графическими файлами
 Summary(uk.UTF-8):     Набір бібліотек для роботи з різними графічними файлами
 Name:          netpbm
-Version:       10.35.66
-Release:       8
+Version:       10.47.63
+Release:       2
 License:       Freeware
 Group:         Libraries
 #  svn export https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{version} (where version from doc/HISTORY)
 #  svn export https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
-Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 1aaafa102fc88a373db4103e498193d7
+Source0:       http://downloads.sourceforge.net/netpbm/%{name}-%{version}.tgz
+# Source0-md5: ccc2d0250945f85d5d3f9f5287643bd9
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 8fb174f8da02ea01bf72a9dc61be10f1
 Source2:       %{name}-docs-20030520.tar.bz2
@@ -25,17 +25,17 @@ Source2:    %{name}-docs-20030520.tar.bz2
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-build.patch
 URL:           http://netpbm.sourceforge.net/
-BuildRequires: xorg-lib-libX11-devel
 BuildRequires: flex
 BuildRequires: jasper-devel
 BuildRequires: jbigkit-devel
 BuildRequires: libjpeg-devel >= 7
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
-BuildRequires: libxml2-devel
+BuildRequires: libxml2-devel >= 2
 BuildRequires: perl-base
+BuildRequires: perl-modules
 %{?with_svga:BuildRequires:    svgalib-devel}
-%{!?with_svga:BuildConflicts:  svgalib-devel}
+BuildRequires: xorg-lib-libX11-devel
 Obsoletes:     libgr
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -251,7 +251,7 @@ EOF
        XML2LIBS="$(%{_bindir}/xml2-config --libs)" \
        JASPERLIB="" \
        JASPERDEPLIBS="-ljasper" \
-       JASPERHDR_DIR="/usr/include/jasper" \
+       JASPERHDR_DIR="%{_includedir}/jasper" \
        NETPBM_DOCURL="%{_docdir}/%{name}-%{version}/netpbm.sourceforge.net/doc/"
 
 %install
@@ -263,21 +263,21 @@ rm -rf PKG
        pkgdir=$(pwd)/PKG \
        LINUXSVGALIB="%{?with_svga:%{_libdir}/libvga.so}%{!?with_svga:NONE}"
 
-rm -f PKG/bin/doc.url
+%{__rm} PKG/bin/doc.url
 cp -df PKG/bin/* $RPM_BUILD_ROOT%{_bindir}
 cp -df PKG/lib/* $RPM_BUILD_ROOT%{_libdir}
-install PKG/link/*.a $RPM_BUILD_ROOT%{_libdir}
-install PKG/include/*.h $RPM_BUILD_ROOT%{_includedir}
-install PKG/man/man1/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install PKG/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
-install PKG/man/man5/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
+cp -p PKG/link/*.a $RPM_BUILD_ROOT%{_libdir}
+cp -pr PKG/include/netpbm $RPM_BUILD_ROOT%{_includedir}
+cp -p PKG/man/man1/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p PKG/man/man3/*.3 $RPM_BUILD_ROOT%{_mandir}/man3
+cp -p PKG/man/man5/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
 # Install the static-only librle.a
-install urt/{rle,rle_config}.h $RPM_BUILD_ROOT%{_includedir}
-install urt/librle.a $RPM_BUILD_ROOT%{_libdir}
+cp -p urt/{rle,rle_config}.h $RPM_BUILD_ROOT%{_includedir}
+cp -p urt/librle.a $RPM_BUILD_ROOT%{_libdir}
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.netpbm-non-english-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.netpbm-non-english-man-pages
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -287,15 +287,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README doc/{COPYRIGHT.PATENT,HISTORY,USERDOC} netpbm.sourceforge.net
+%doc README doc/{COPYRIGHT.PATENT,HISTORY,USERDOC}
 %attr(755,root,root) %{_libdir}/libnetpbm.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnetpbm.so.10
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnetpbm.so
-%{_includedir}/*.h
-%{_mandir}/man3/*
+%{_includedir}/netpbm
+%{_mandir}/man3/libnetpbm.3*
 
 %files static
 %defattr(644,root,root,755)
@@ -304,22 +304,30 @@ rm -rf $RPM_BUILD_ROOT
 %files rle-static
 %defattr(644,root,root,755)
 %{_libdir}/librle.a
+%{_includedir}/rle.h
+%{_includedir}/rle_config.h
 
 %files progs
 %defattr(644,root,root,755)
+%doc netpbm.sourceforge.net
 %attr(755,root,root) %{_bindir}/*
-%{_mandir}/man[15]/*
-%lang(fi) %{_mandir}/fi/man[15]/*
+%{_mandir}/man1/*.1*
+%{_mandir}/man5/pam.5*
+%{_mandir}/man5/pbm.5*
+%{_mandir}/man5/pgm.5*
+%{_mandir}/man5/pnm.5*
+%{_mandir}/man5/ppm.5*
+%lang(fi) %{_mandir}/fi/man1/*
 %lang(pl) %{_mandir}/pl/man[15]/*
 %exclude %{_bindir}/pstopnm
-%exclude %{_mandir}/man[15]/pstopnm*
+%exclude %{_mandir}/man1/pstopnm.1*
 %{?with_svga:%exclude %{_bindir}/ppmsvgalib}
 %{?with_svga:%exclude %{_mandir}/man1/ppmsvgalib.1*}
 
 %files progs-pstopnm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pstopnm
-%{_mandir}/man[15]/pstopnm*
+%{_mandir}/man1/pstopnm.1*
 
 %if %{with svga}
 %files ppmsvgalib