- updated to 10.35.80

- updated build patch

Changed files:
    netpbm-build.patch -> 1.3
    netpbm.spec -> 1.106

diff --git a/netpbm-build.patch b/netpbm-build.patch
index 34fab95e40f62f17b12573e62855bbaf50c13e47..c88c470e7e977ed02de9759188b54369f9751e1c 100644 (file)
--- a/netpbm-build.patch
+++ b/netpbm-build.patch
@@ -1,17 +1,3 @@
---- netpbm-10.35.65/buildtools/configure.pl~   2009-06-26 03:35:42.000000000 +0200
-+++ netpbm-10.35.65/buildtools/configure.pl    2009-07-15 08:47:35.271968502 +0200
-@@ -1889,11 +1889,6 @@
-         push(@Makefile_config, "CFLAGS += -fPIC\n");
-         push(@Makefile_config, "LDSHLIB = -shared -fPIC\n");
-         push(@Makefile_config, 'LDFLAGS += -Wl,+b,/usr/pubsw/lib', "\n");
--    } else {
--        # We don't know what to do here.  We used to (before 10.20) just
--        # just assume the compiler was gcc.  We know that the gcc stuff
--        # above does NOT work for HP native compiler.
--        push(@config_mk, "LDSHLIB =\n");
-     }
- } elsif ($platform eq "AIX") {
-     push(@Makefile_config, 'LDFLAGS = -L /usr/pubsw/lib', "\n");
 --- netpbm-10.35.65/converter/ppm/ppmtompeg/jpeg.c~    2006-08-19 05:12:28.000000000 +0200
 +++ netpbm-10.35.65/converter/ppm/ppmtompeg/jpeg.c     2009-07-15 08:52:06.372101451 +0200
 @@ -469,7 +469,7 @@
@@ -23,10 +9,21 @@
  #endif
    
      for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components;
-diff -Naur netpbm-orig/converter/other/pnmtopng.c netpbm/converter/other/pnmtopng.c
---- netpbm-orig/converter/other/pnmtopng.c     2010-01-22 00:13:48.000000000 -0500
-+++ netpbm/converter/other/pnmtopng.c  2010-01-22 00:21:33.000000000 -0500
-@@ -2604,7 +2604,7 @@
+--- netpbm-10.35.80/converter/other/pnmtopng.c.orig    2010-12-10 19:19:40.000000000 +0100
++++ netpbm-10.35.80/converter/other/pnmtopng.c 2011-03-27 14:02:53.641739787 +0200
+@@ -69,11 +69,6 @@
+ #include "nstring.h"
+ #include "version.h"
+ 
+-#if PNG_LIBPNG_VER >= 10400
+-#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
+-#error You need either an older PNG library (older than 1.4)
+-#error newer Netpbm source code (at least 10.47.04)
+-#endif
+ 
+ 
+ struct zlibCompression {
+@@ -2611,7 +2606,7 @@
      info_ptr->num_palette = palette_size;
      if (trans_size > 0) {
          info_ptr->valid |= PNG_INFO_tRNS;
@@ -35,7 +32,7 @@ diff -Naur netpbm-orig/converter/other/pnmtopng.c netpbm/converter/other/pnmtopn
          info_ptr->num_trans = trans_size;   /* omit opaque values */
      }
      /* creating hIST chunk */
-@@ -2641,7 +2641,7 @@
+@@ -2648,7 +2643,7 @@
          info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
          if (transparent > 0) {
              info_ptr->valid |= PNG_INFO_tRNS;
@@ -44,7 +41,7 @@ diff -Naur netpbm-orig/converter/other/pnmtopng.c netpbm/converter/other/pnmtopn
                  xelToPngColor_16(transcolor, maxval, png_maxval);
          }
      } else {
-@@ -2653,10 +2653,10 @@
+@@ -2660,10 +2655,10 @@
          if (info_ptr->valid && PNG_INFO_tRNS) 
              pm_message("Transparent color {gray, red, green, blue} = "
                         "{%d, %d, %d, %d}",
@@ -59,10 +56,21 @@ diff -Naur netpbm-orig/converter/other/pnmtopng.c netpbm/converter/other/pnmtopn
          else
              pm_message("No transparent color");
      }
-diff -Naur netpbm-orig/converter/other/pngtopnm.c netpbm/converter/other/pngtopnm.c
---- netpbm-orig/converter/other/pngtopnm.c     2010-01-22 00:33:25.000000000 -0500
-+++ netpbm/converter/other/pngtopnm.c  2010-01-22 00:39:21.000000000 -0500
-@@ -476,7 +476,7 @@
+--- netpbm-10.35.80/converter/other/pngtopnm.c.orig    2011-01-15 21:18:40.000000000 +0100
++++ netpbm-10.35.80/converter/other/pngtopnm.c 2011-03-27 14:04:03.089736435 +0200
+@@ -44,11 +44,6 @@
+ #include "nstring.h"
+ #include "shhopt.h"
+ 
+-#if PNG_LIBPNG_VER >= 10400
+-#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
+-#error You need either an older PNG library (older than 1.4)
+-#error newer Netpbm source code (at least 10.48)
+-#endif
+ 
+ typedef struct _jmpbuf_wrapper {
+   jmp_buf jmpbuf;
+@@ -482,7 +477,7 @@
      bool retval;
  
      if (info_ptr->valid & PNG_INFO_tRNS) {
@@ -71,7 +79,7 @@ diff -Naur netpbm-orig/converter/other/pngtopnm.c netpbm/converter/other/pngtopn
      
  
          /* There seems to be a problem here: you can't compare real
-@@ -569,8 +569,8 @@
+@@ -575,8 +570,8 @@
              for (i = 0, foundGray = FALSE;
                   i < info_ptr->num_trans && !foundGray;
                   ++i) {
@@ -82,7 +90,7 @@ diff -Naur netpbm-orig/converter/other/pngtopnm.c netpbm/converter/other/pngtopn
                      foundGray = TRUE;
                  }
              }
-@@ -641,7 +641,7 @@
+@@ -647,7 +642,7 @@
                  unsigned int i;
                  trans_mix = TRUE;
                  for (i = 0; i < info_ptr->num_trans; ++i)
@@ -91,7 +99,7 @@ diff -Naur netpbm-orig/converter/other/pngtopnm.c netpbm/converter/other/pngtopn
                          trans_mix = FALSE;
                          break;
                      }
-@@ -879,7 +879,7 @@
+@@ -885,7 +880,7 @@
                  setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
                         ((info_ptr->valid & PNG_INFO_tRNS) &&
                          (fgColor.r == 
@@ -100,7 +108,7 @@ diff -Naur netpbm-orig/converter/other/pngtopnm.c netpbm/converter/other/pngtopn
                                         totalgamma))) ?
                         0 : maxval);
              }
-@@ -908,7 +908,7 @@
+@@ -914,7 +909,7 @@
                  setXel(&xelrow[col], fgColor, bgColor, alpha_handling,
                         (info_ptr->valid & PNG_INFO_tRNS) &&
                         index < info_ptr->num_trans ?

diff --git a/netpbm.spec b/netpbm.spec
index 40bb9ab51be4cf2e4a346f0e1290ae5b6c8fd8ed..ec2d90dd29064e3d4e4f9993b94ef0a61dd25479 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.35.80
+Release:       1
 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: 2edf98b802a82e5367fc52382e9ac144
 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
@@ -36,7 +36,6 @@ BuildRequires:        perl-base
 BuildRequires: perl-modules
 %{?with_svga:BuildRequires:    svgalib-devel}
 BuildRequires: xorg-lib-libX11-devel
-%{!?with_svga:BuildConflicts:  svgalib-devel}
 Obsoletes:     libgr
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -264,7 +263,7 @@ 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}
@@ -278,7 +277,7 @@ install urt/{rle,rle_config}.h $RPM_BUILD_ROOT%{_includedir}
 install 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
@@ -295,8 +294,19 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnetpbm.so
-%{_includedir}/*.h
-%{_mandir}/man3/*
+%{_includedir}/bitio.h
+%{_includedir}/colorname.h
+%{_includedir}/mallocvar.h
+%{_includedir}/nstring.h
+%{_includedir}/pam*.h
+%{_includedir}/pbm*.h
+%{_includedir}/pgm.h
+%{_includedir}/pm*.h
+%{_includedir}/pnm.h
+%{_includedir}/ppm*.h
+%{_includedir}/rle*.h
+%{_includedir}/shhopt.h
+%{_mandir}/man3/libnetpbm.3*
 
 %files static
 %defattr(644,root,root,755)
@@ -308,19 +318,44 @@ rm -rf $RPM_BUILD_ROOT
 
 %files progs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man[15]/*
-%lang(fi) %{_mandir}/fi/man[15]/*
+%attr(755,root,root) %{_bindir}/*topam
+%attr(755,root,root) %{_bindir}/*topbm
+%attr(755,root,root) %{_bindir}/*topgm
+%attr(755,root,root) %{_bindir}/*topnm
+%attr(755,root,root) %{_bindir}/*toppm
+%attr(755,root,root) %{_bindir}/manweb
+%attr(755,root,root) %{_bindir}/pam*
+%attr(755,root,root) %{_bindir}/pbm*
+%attr(755,root,root) %{_bindir}/pgm*
+%attr(755,root,root) %{_bindir}/pnm*
+%attr(755,root,root) %{_bindir}/ppm*
+%{_mandir}/man1/*topam.1*
+%{_mandir}/man1/*topbm.1*
+%{_mandir}/man1/*topgm.1*
+%{_mandir}/man1/*topnm.1*
+%{_mandir}/man1/*toppm.1*
+%{_mandir}/man1/manweb.1*
+%{_mandir}/man1/pam*.1*
+%{_mandir}/man1/pbm*.1*
+%{_mandir}/man1/pgm*.1*
+%{_mandir}/man1/pnm*.1*
+%{_mandir}/man1/ppm*.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