- started update to 10.15 (all formats in single library now)

- Makefile.common changes moved to other place, patch renamed to "make"

Changed files:
    netpbm-Makefile.common.patch -> 1.4
    netpbm-make.patch -> 1.1
    netpbm.spec -> 1.36

diff --git a/netpbm-Makefile.common.patch b/netpbm-Makefile.common.patch
deleted file mode 100644 (file)
index f4f8794..0000000
--- a/netpbm-Makefile.common.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- netpbm-9.23/Makefile.common.orig   Sat Jan  5 01:10:54 2002
-+++ netpbm-9.23/Makefile.common        Sun Jan  6 07:56:22 2002
-@@ -367,7 +367,7 @@
- install.sharedlibstub: 
-       cd $(INSTALLSTATICLIBS) ; \
-           rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX); \
--          $(SYMLINK) $(INSTALLLIBS)/lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ) \
-+          $(SYMLINK) lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ) \
-             lib$(LIBROOT).$(NETPBMLIBSUFFIX)
- else
- # I have no idea what link-time stuff is required for other library types.
-@@ -386,7 +386,8 @@
-       $(INSTALL) -c -m $(INSTALL_PERM_LIBD) $< $(INSTALLLIBS)
-       cd $(INSTALLLIBS) ; \
-           rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ); \
--          $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ)
-+          $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ); \
-+          $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
- #install a Windows DLL shared library
-diff -urN netpbm-9.25.orig/GNUmakefile netpbm-9.25/GNUmakefile
---- netpbm-9.25.orig/GNUmakefile       Sun Mar  3 18:19:06 2002
-+++ netpbm-9.25/GNUmakefile    Sat Apr 19 10:25:04 2003
-@@ -139,7 +139,6 @@
-       for i in $(SUBDIRS) ; do \
-           $(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.lib ; \
-       done
--      $(SRCDIR)/buildtools/try_ldconfig
- endif
- 
- 

diff --git a/netpbm-make.patch b/netpbm-make.patch
new file mode 100644 (file)
index 0000000..0d0cc7a
--- /dev/null
+++ b/netpbm-make.patch
@@ -0,0 +1,12 @@
+--- netpbm-10.15/lib/Makefile.orig     2003-01-19 20:49:07.000000000 +0100
++++ netpbm-10.15/lib/Makefile  2003-05-17 23:06:16.000000000 +0200
+@@ -186,7 +186,8 @@
+         libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)  $(PKGDIR)/lib/
+       cd $(PKGDIR)/lib/ ; \
+           rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ); \
+-          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME)
++          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME); \
++          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) libnetpbm.$(NETPBMLIBSUFFIX)
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)
+ #install a Windows DLL shared library

diff --git a/netpbm.spec b/netpbm.spec
index fccae46b86fff677f6fd3fc20c2addeee328cf11..9f5fc898e77922c31e7042a613cc7f64ef5810a0 100644 (file)
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -2,6 +2,11 @@
 # Conditional build:
 # _without_svga                - don't build ppmsvgalib tool
 #
+# TODO: documentation for progs:
+# - download HTML docs from http://netpbm.sourceforge.net/doc/
+#   and include in package
+# - try to get some real man pages (old netpbm? Debian?)
+#
 %ifnarch %{ix86} alpha
 %define        _without_svga   1
 %endif
@@ -11,13 +16,13 @@ Summary(pt_BR):     Ferramentas para manipular arquivos graficos nos formatos suport
 Summary(ru):   îÁÂÏÒ ÂÉÂÌÉÏÔÅË ÄÌÑ ÒÁÂÏÔÙ Ó ÒÁÚÌÉÞÎÙÍÉ ÇÒÁÆÉÞÅÓËÉÍÉ ÆÁÊÌÁÍÉ
 Summary(uk):   îÁÂ¦Ò Â¦Â̦ÏÔÅË ÄÌÑ ÒÏÂÏÔÉ Ú Ò¦ÚÎÉÍÉ ÇÒÁƦÞÎÉÍÉ ÆÁÊÌÁÍÉ
 Name:          netpbm
-Version:       9.25
-Release:       3
+Version:       10.15
+Release:       0.1
 License:       Freeware
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tgz
 Source1:       %{name}-non-english-man-pages.tar.bz2
-Patch0:                %{name}-Makefile.common.patch
+Patch0:                %{name}-make.patch
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
@@ -189,67 +194,40 @@ u
        JPEGHDR_DIR=%{_includedir} \
        PNGHDR_DIR=%{_includedir} \
        TIFFHDR_DIR=%{_includedir} \
-       JBIGLIB_DIR=%{_libdir} \
-       JPEGLIB_DIR=%{_libdir} \
-       PNGLIB_DIR=%{_libdir} \
-       TIFFLIB_DIR=%{_libdir} << EOF
+       JBIGLIB_DIR=/usr/lib/libjbig.so << EOF
 gnu
 regular
 shared
 yes
-%{_prefix}
-bin
-lib
-lib
-include
-man
-%{?_without_svga:NONE}%{!?_without_svga:/usr/lib}
+libjpeg.so
+
+libtiff.so
+
+libpng.so
+
+libz.so
+
+
 EOF
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir}/man{1,3,5}}
+
+%{__make} package pkgdir=`pwd`/PKG
 
-#      JBIGINC_DIR=$RPM_BUILD_ROOT%{_includedir} \
-#      JPEGINC_DIR=$RPM_BUILD_ROOT%{_includedir} \
-#      PNGINC_DIR=$RPM_BUILD_ROOT%{_includedir} \
-#      TIFFINC_DIR=$RPM_BUILD_ROOT%{_includedir}
-
-PATH="`pwd`:${PATH}" \
-%{__make} install \
-       JBIGLIB_DIR=%{_libdir} \
-       JPEGLIB_DIR=%{_libdir} \
-       PNGLIB_DIR=%{_libdir} \
-       TIFFLIB_DIR=%{_libdir} \
-       INSTALL_PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-       INSTALLBINARIES=$RPM_BUILD_ROOT%{_bindir} \
-       INSTALLHDRS=$RPM_BUILD_ROOT%{_includedir} \
-       INSTALLLIBS=$RPM_BUILD_ROOT%{_libdir} \
-       INSTALLMANUALS1=$RPM_BUILD_ROOT%{_mandir}/man1 \
-       INSTALLMANUALS3=$RPM_BUILD_ROOT%{_mandir}/man3 \
-       INSTALLMANUALS5=$RPM_BUILD_ROOT%{_mandir}/man5
-
-# Install header files.
-install -d $RPM_BUILD_ROOT%{_includedir}
-install pbm/pbm.h $RPM_BUILD_ROOT%{_includedir}
-install pbm/pm.h $RPM_BUILD_ROOT%{_includedir}
-install pm_config.h $RPM_BUILD_ROOT%{_includedir}
-install pgm/pgm.h $RPM_BUILD_ROOT%{_includedir}
-install pnm/pnm.h $RPM_BUILD_ROOT%{_includedir}
-install ppm/ppm.h $RPM_BUILD_ROOT%{_includedir}
-install shhopt/shhopt.h $RPM_BUILD_ROOT%{_includedir}
+rm -f 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/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
 
 # Install the static-only librle.a
 install urt/{rle,rle_config}.h $RPM_BUILD_ROOT%{_includedir}
 install urt/librle.a $RPM_BUILD_ROOT%{_libdir}
 
-# Fixup symlinks.
-ln -sf gemtopnm $RPM_BUILD_ROOT%{_bindir}/gemtopbm
-ln -sf pnmtoplainpnm $RPM_BUILD_ROOT%{_bindir}/pnmnoraw
-
-# Fixup perl paths in the two scripts that require it.
-perl -pi -e 's^/bin/perl^%{__perl}^' \
-       $RPM_BUILD_ROOT%{_bindir}/{ppmfade,ppmshadow}
-
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 %clean
@@ -260,18 +238,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc README doc/{COPYRIGHT.PATENT,HISTORY,USERDOC}
+%attr(755,root,root) %{_libdir}/libnetpbm.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc COPYRIGHT.PATENT HISTORY README
+%attr(755,root,root) %{_libdir}/libnetpbm.so
 %{_includedir}/*.h
-%attr(755,root,root) %{_libdir}/lib*.so
 %{_mandir}/man3/*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libp*.a
+%{_libdir}/libnetpbm.a
 
 %files rle-static
 %defattr(644,root,root,755)