- updated to 4.0.3 (mostly bugfixes), updated patches (with one more change in

  shared-libs patch to avoid "-s" in `pdflib-config --libs`)
- revised docs, added license text (required by itself)
- removed hacks for libpng 1.2.2 and libtool 1.4*, BR: fixed libtool

Changed files:
    pdflib-DESTDIR.patch -> 1.5
    pdflib-shared-libs.patch -> 1.3
    pdflib.spec -> 1.45

diff --git a/pdflib-DESTDIR.patch b/pdflib-DESTDIR.patch
index 06e97c3de2b7aef9578be725c3451f82b2af5849..b657bd04c3df89398f7e3c79dbffd2d760bf767e 100644 (file)
--- a/pdflib-DESTDIR.patch
+++ b/pdflib-DESTDIR.patch
@@ -1,38 +1,30 @@
-diff -urN pdflib-4.0.0.org/Makefile.in pdflib-4.0.0/Makefile.in
---- pdflib-4.0.0.org/Makefile.in       Thu May 10 21:46:34 2001
-+++ pdflib-4.0.0/Makefile.in   Thu May 10 22:30:44 2001
-@@ -10,11 +10,11 @@
- srcdir = @srcdir@
- 
- # installation directories
--prefix                = @prefix@
--exec_prefix   = @exec_prefix@
--libdir                = @libdir@
--includedir    = @includedir@
--bindir        = @bindir@
-+prefix                = $(DESTDIR)@prefix@
-+exec_prefix   = $(DESTDIR)@exec_prefix@
-+libdir                = $(DESTDIR)@libdir@
-+includedir    = $(DESTDIR)@includedir@
-+bindir        = $(DESTDIR)@bindir@
- 
- # ------------------------- default target  -------------------------------
- 
-@@ -111,6 +111,7 @@
+diff -Nur pdflib-4.0.3.orig/Makefile.in pdflib-4.0.3/Makefile.in
+--- pdflib-4.0.3.orig/Makefile.in      Mon Mar 25 15:13:34 2002
++++ pdflib-4.0.3/Makefile.in   Wed Jul 24 20:09:08 2002
+@@ -114,11 +114,11 @@
  # --------------------------- install ---------------------------------
  
  install: pdflib_install @BINDINGS_INSTALL@
-+      $(INSTALL) -d $(bindir)
-       $(INSTALL) pdflib-config $(bindir)
+-      if test ! -d $(bindir) ; then   \
+-          mkdir -p $(bindir);         \
+-          chmod 755 $(bindir);        \
++      if test ! -d $(DESTDIR)$(bindir) ; then         \
++          mkdir -p $(DESTDIR)$(bindir);               \
++          chmod 755 $(DESTDIR)$(bindir);      \
+       fi
+-      $(INSTALL) pdflib-config $(bindir)
++      $(INSTALL) pdflib-config $(DESTDIR)$(bindir)
  
  pdflib_install:
---- flib-4.0.2/bind/java/Makefile.in.orig      Mon Jan 28 13:57:53 2002
-+++ flib-4.0.2/bind/java/Makefile.in   Tue Feb 12 11:53:01 2002
+       -cd pdflib && $(MAKE) install
+diff -Nur pdflib-4.0.3.orig/bind/java/Makefile.in pdflib-4.0.3/bind/java/Makefile.in
+--- pdflib-4.0.3.orig/bind/java/Makefile.in    Mon Jan 28 13:57:53 2002
++++ pdflib-4.0.3/bind/java/Makefile.in Wed Jul 24 20:13:35 2002
 @@ -93,12 +93,13 @@
            -dlopen $(SWIG_LIB) java quickreference-ibm
  
  install: $(SWIG_LIB) pdflib.jar
-+      $(INSTALL) -d $(LANG_LIBDIR)
++      $(INSTALL) -d $(DESTDIR)$(LANG_LIBDIR)
        @-if test -f .libs/libpdf_java.jnilib; then             \
            $(LIBTOOL) --mode=install $(INSTALL_DATA)           \
 -              .libs/libpdf_java.jnilib $(LANG_LIBDIR);        \
@@ -57,79 +49,138 @@ diff -urN pdflib-4.0.0.org/Makefile.in pdflib-4.0.0/Makefile.in
        fi
  
  clean:
-diff -urN pdflib-4.0.0.org/bind/perl/Makefile.in pdflib-4.0.0/bind/perl/Makefile.in
---- pdflib-4.0.0.org/bind/perl/Makefile.in     Thu May 10 21:46:34 2001
-+++ pdflib-4.0.0/bind/perl/Makefile.in Thu May 10 22:12:13 2001
-@@ -26,8 +26,8 @@
- .c.$(OBJ):
-       $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFINES) $<
- 
--LANG_LIBDIR   = @PERLLIBDIR@
--PERLMODDIR    = @PERLMODDIR@
-+LANG_LIBDIR   = $(DESTDIR)@PERLLIBDIR@
-+PERLMODDIR    = $(DESTDIR)@PERLMODDIR@
- PERLBIN               = @PERL@ -I. -I.libs
- 
- SWIG          = swig1.2 -I../../pdflib -perl5 -shadow -stat
-@@ -60,6 +60,7 @@
+diff -Nur pdflib-4.0.3.orig/bind/perl/Makefile.in pdflib-4.0.3/bind/perl/Makefile.in
+--- pdflib-4.0.3.orig/bind/perl/Makefile.in    Fri Oct 12 10:54:48 2001
++++ pdflib-4.0.3/bind/perl/Makefile.in Wed Jul 24 20:13:15 2002
+@@ -60,13 +60,14 @@
        -$(PERLBIN) quickreference.pl
  
  install: $(SWIG_LIB)
-+      $(INSTALL) -d $(LANG_LIBDIR)
++      $(INSTALL) -d $(DESTDIR)$(LANG_LIBDIR)
        $(LIBTOOL) --mode=install \
-               $(INSTALL_DATA) $(SWIG_LIB) $(LANG_LIBDIR)
-       $(INSTALL_DATA) pdflib_pl.pm $(LANG_LIBDIR)
-diff -urN pdflib-4.0.0.org/bind/python/Makefile.in pdflib-4.0.0/bind/python/Makefile.in
---- pdflib-4.0.0.org/bind/python/Makefile.in   Thu May 10 21:46:35 2001
-+++ pdflib-4.0.0/bind/python/Makefile.in       Thu May 10 22:12:13 2001
-@@ -26,7 +26,7 @@
- .c.$(OBJ):
-       $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFINES) $<
- 
--LANG_LIBDIR   = @PYTHONLIBDIR@
-+LANG_LIBDIR   = $(DESTDIR)@PYTHONLIBDIR@
- 
- SWIG          = swig1.2 -I../../pdflib -python -stat
- SWIG_LIB      = pdflib_py.la
-@@ -62,6 +62,7 @@
+-              $(INSTALL_DATA) $(SWIG_LIB) $(LANG_LIBDIR)
+-      $(INSTALL_DATA) pdflib_pl.pm $(LANG_LIBDIR)
++              $(INSTALL_DATA) $(SWIG_LIB) $(DESTDIR)$(LANG_LIBDIR)
++      $(INSTALL_DATA) pdflib_pl.pm $(DESTDIR)$(LANG_LIBDIR)
+ 
+ uninstall:
+       $(LIBTOOL) --mode=uninstall \
+-              $(RM) $(LANG_LIBDIR)/$(SWIG_LIB) $(LANG_LIBDIR)/pdflib_pl.pm 
++              $(RM) $(LANG_LIBDIR)/$(SWIG_LIB) $(DESTDIR)$(LANG_LIBDIR)/pdflib_pl.pm 
+ 
+ clean:
+       -$(RM) *.$(OBJ) *.lo *.la .libs hello.pdf pdfclock.pdf  \
+diff -Nur pdflib-4.0.3.orig/bind/python/Makefile.in pdflib-4.0.3/bind/python/Makefile.in
+--- pdflib-4.0.3.orig/bind/python/Makefile.in  Fri Oct 12 10:54:48 2001
++++ pdflib-4.0.3/bind/python/Makefile.in       Wed Jul 24 20:14:21 2002
+@@ -62,18 +62,19 @@
        -$(LIBTOOL) --mode=execute -dlopen $(SWIG_LIB) python personalize.py
  
  install: $(SWIG_LIB)
-+      $(INSTALL) -d $(LANG_LIBDIR)
++      $(INSTALL) -d $(DESTDIR)$(LANG_LIBDIR)
        @-if test -f .libs/libpdflib_py.dylib; then             \
-           $(INSTALL_DATA) .libs/pdflib_py.so $(LANG_LIBDIR);  \
+-          $(INSTALL_DATA) .libs/pdflib_py.so $(LANG_LIBDIR);  \
++          $(INSTALL_DATA) .libs/pdflib_py.so $(DESTDIR)$(LANG_LIBDIR);        \
        else                                                    \
-diff -urN pdflib-4.0.0.org/bind/tcl/Makefile.in pdflib-4.0.0/bind/tcl/Makefile.in
---- pdflib-4.0.0.org/bind/tcl/Makefile.in      Thu May 10 21:46:35 2001
-+++ pdflib-4.0.0/bind/tcl/Makefile.in  Thu May 10 22:12:13 2001
-@@ -26,8 +26,8 @@
- .c.$(OBJ):
-       $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFINES) $<
- 
--LANG_LIBDIR   = @TCLPACKAGEDIR@
--TCLBIN                = @TCLBIN@
-+LANG_LIBDIR   = $(DESTDIR)@TCLPACKAGEDIR@
-+TCLBIN                = $(DESTDIR)@TCLBIN@
- 
- SWIG          = swig1.2 -I../../pdflib -tcl -stat
- SWIG_LIB      = pdflib_tcl.la
-diff -urN pdflib-4.0.0.org/pdflib/Makefile.in pdflib-4.0.0/pdflib/Makefile.in
---- pdflib-4.0.0.org/pdflib/Makefile.in        Thu May 10 21:46:34 2001
-+++ pdflib-4.0.0/pdflib/Makefile.in    Thu May 10 22:12:13 2001
-@@ -16,11 +16,11 @@
- INTERNALLIBS  = @INTERNALLIBS@
- 
- # installation directories
--prefix                = @prefix@
--exec_prefix   = @exec_prefix@
--libdir                = @libdir@
--includedir    = @includedir@
--bindir        = @bindir@
-+prefix                = $(DESTDIR)@prefix@
-+exec_prefix   = $(DESTDIR)@exec_prefix@
-+libdir                = $(DESTDIR)@libdir@
-+includedir    = $(DESTDIR)@includedir@
-+bindir        = $(DESTDIR)@bindir@
- 
- TIFFLIBINC    = @TIFFLIBINC@
- ZLIBINC               = @ZLIBINC@
+           $(LIBTOOL) --mode=install $(INSTALL_DATA)           \
+-              $(SWIG_LIB) $(LANG_LIBDIR);                     \
++              $(SWIG_LIB) $(DESTDIR)$(LANG_LIBDIR);                   \
+       fi
+ 
+ uninstall:
+       @-if test -f .libs/libpdflib_py.dylib; then                      \
+-          $(LIBTOOL) --mode=uninstall $(RM) $(LANG_LIBDIR)/pdflib_py.so\
++          $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(LANG_LIBDIR)/pdflib_py.so\
+       else                                                             \
+-          $(LIBTOOL) --mode=uninstall $(RM) $(LANG_LIBDIR)/$(SWIG_LIB) \
++          $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(LANG_LIBDIR)/$(SWIG_LIB) \
+       fi
+ 
+ clean:
+diff -Nur pdflib-4.0.3.orig/bind/tcl/Makefile.in pdflib-4.0.3/bind/tcl/Makefile.in
+--- pdflib-4.0.3.orig/bind/tcl/Makefile.in     Fri Oct 12 10:54:48 2001
++++ pdflib-4.0.3/bind/tcl/Makefile.in  Wed Jul 24 20:15:34 2002
+@@ -63,29 +63,29 @@
+       -$(LIBTOOL) --mode=execute -dlopen $(SWIG_LIB) $(TCLBIN) personalize.tcl
+ 
+ install: $(SWIG_LIB)
+-      if test ! -d $(LANG_LIBDIR) ; then      \
+-          mkdir -p $(LANG_LIBDIR);            \
+-          chmod 755 $(LANG_LIBDIR);           \
++      if test ! -d $(DESTDIR)$(LANG_LIBDIR) ; then    \
++          mkdir -p $(DESTDIR)$(LANG_LIBDIR);          \
++          chmod 755 $(DESTDIR)$(LANG_LIBDIR);         \
+       fi
+-      $(INSTALL_DATA) pkgIndex.tcl $(LANG_LIBDIR)
++      $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(LANG_LIBDIR)
+       @-if test -f .libs/libpdflib_tcl.dylib; then                    \
+-          $(INSTALL_DATA) .libs/pdflib_tcl.dylib $(LANG_LIBDIR);      \
++          $(INSTALL_DATA) .libs/pdflib_tcl.dylib $(DESTDIR)$(LANG_LIBDIR);    \
+       else                                                            \
+           $(LIBTOOL) --mode=install $(INSTALL_DATA)                   \
+-              $(SWIG_LIB) $(LANG_LIBDIR);                             \
++              $(SWIG_LIB) $(DESTDIR)$(LANG_LIBDIR);                           \
+       fi
+ 
+ uninstall:
+       @-if test -f .libs/libpdflib_tcl.dylib; then                    \
+           $(LIBTOOL) --mode=uninstall $(RM)                           \
+-              $(LANG_LIBDIR)/pdflib_tcl.dylib                         \
+-              $(LANG_LIBDIR)/pkgIndex.tcl;                            \
++              $(DESTDIR)$(LANG_LIBDIR)/pdflib_tcl.dylib                               \
++              $(DESTDIR)$(LANG_LIBDIR)/pkgIndex.tcl;                          \
+       else                                                            \
+           $(LIBTOOL) --mode=uninstall $(RM)                           \
+-              $(LANG_LIBDIR)/$(SWIG_LIB)                              \
+-              $(LANG_LIBDIR)/pkgIndex.tcl;                            \
++              $(DESTDIR)$(LANG_LIBDIR)/$(SWIG_LIB)                            \
++              $(DESTDIR)$(LANG_LIBDIR)/pkgIndex.tcl;                          \
+       fi
+-      $(RM) $(LANG_LIBDIR)
++      $(RM) $(DESTDIR)$(LANG_LIBDIR)
+ 
+ clean:
+       -$(RM) *.$(OBJ) *.lo *.la .libs hello.pdf image.pdf pdfclock.pdf personalize.pdf quickreference.pdf
+diff -Nur pdflib-4.0.3.orig/pdflib/Makefile.in pdflib-4.0.3/pdflib/Makefile.in
+--- pdflib-4.0.3.orig/pdflib/Makefile.in       Fri Oct 12 10:54:48 2001
++++ pdflib-4.0.3/pdflib/Makefile.in    Wed Jul 24 20:18:23 2002
+@@ -107,28 +107,28 @@
+       -$(RM) *.$(OBJ) *.lo *.la *.bak .libs
+ 
+ install: dummy
+-      if test ! -d $(libdir) ; then   \
+-          mkdir -p $(libdir);         \
+-          chmod 755 $(libdir);        \
++      if test ! -d $(DESTDIR)$(libdir) ; then         \
++          mkdir -p $(DESTDIR)$(libdir);               \
++          chmod 755 $(DESTDIR)$(libdir);      \
+       fi
+-      if test ! -d $(includedir) ; then       \
+-          mkdir -p $(includedir);             \
+-          chmod 755 $(includedir);            \
++      if test ! -d $(DESTDIR)$(includedir) ; then     \
++          mkdir -p $(DESTDIR)$(includedir);           \
++          chmod 755 $(DESTDIR)$(includedir);          \
+       fi
+-      $(INSTALL_DATA) pdflib.h $(includedir)
++      $(INSTALL_DATA) pdflib.h $(DESTDIR)$(includedir)
+       @-if test "$(WITH_SHARED)" = "no"; then \
+           cp .libs/libpdf.la .libs/libpdf.lai;\
+       fi
+-      $(LIBTOOL) $(INSTALL_DATA) $(LIBPDF).la $(libdir);
++      $(LIBTOOL) $(INSTALL_DATA) $(LIBPDF).la $(DESTDIR)$(libdir);
+       @-if test "$(WITH_SHARED)" = "yes"; then        \
+-          $(LIBTOOL) -n --finish $(libdir);\
++          $(LIBTOOL) -n --finish $(DESTDIR)$(libdir);\
+       else\
+           rm -f .libs/libpdf.lai;\
+       fi
+ 
+ uninstall: dummy
+-      $(RM) $(includedir)/pdflib.h
+-      -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(LIBPDF).la
++      $(RM) $(DESTDIR)$(includedir)/pdflib.h
++      -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBPDF).la
+ 
+ depend: dummy
+       cp Makefile.in Makefile.in.bak

diff --git a/pdflib-shared-libs.patch b/pdflib-shared-libs.patch
index 400e3c6b22d44ee8447533a0eef802d9f5884f8d..9bd5dea65bcc0398b3e9872e9ddf33c05587b1fd 100644 (file)
--- a/pdflib-shared-libs.patch
+++ b/pdflib-shared-libs.patch
@@ -49,14 +49,22 @@ diff -urN pdflib-4.0.0.org/configure.in pdflib-4.0.0/configure.in
  # --------------------------------------------------------------------
  #     PDFlib C++ language binding
  # --------------------------------------------------------------------
+@@ -899,7 +899,6 @@
+ fi
+ 
+ DEFINES="$CFLAGS $DEFINES $INCLUDES $PLATFORM"
+-EXTERNALLIBS="$LDFLAGS $EXTERNALLIBS"
+ 
+ AC_SUBST(BINDINGS)
+ AC_SUBST(WITH_PDI)
 @@ -881,8 +867,8 @@
  
  fi
  
--PDFLIBCONVENIENT="\$(top_builddir)/pdflib/libpdf_.la $INTERNALLIBS"
+-PDFLIBCONVENIENT="\$(top_builddir)/pdflib/libpdf_.la $INTERNALLIBS $EXTERNALLIBS"
 -PDFLIBLINKSELF="$RPATH $PDFLIBCONVENIENT"
-+PDFLIBCONVENIENT="\$(top_builddir)/pdflib/libpdf.la $INTERNALLIBS"
-+PDFLIBLINKSELF="$RPATH \$(top_builddir)/pdflib/libpdf_.la -ltiff -lpng -lz"
++PDFLIBCONVENIENT="\$(top_builddir)/pdflib/libpdf.la $INTERNALLIBS $EXTERNALLIBS"
++PDFLIBLINKSELF="$RPATH \$(top_builddir)/pdflib/libpdf_.la"
  PDFLIBLINK="\$(top_builddir)/pdflib/libpdf.la $EXTERNALLIBS"
  
  AC_SUBST(EXTERNALLIBS)

diff --git a/pdflib.spec b/pdflib.spec
index 01b6c32f6af145de513580b7fea9bce5555022b6..1a31941f59ac049a1da830871fe11870a01f44fc 100644 (file)
--- a/pdflib.spec
+++ b/pdflib.spec
@@ -3,26 +3,26 @@
 %include       /usr/lib/rpm/macros.python
 
 Summary:       Portable C library for dynamically generating PDF files
-Summary(pl):   Przeno¶na biblioteka C do dynamicznej generacji plików PDF
+Summary(pl):   Przeno¶na biblioteka C do dynamicznego generowania plików PDF
 Name:          pdflib
-Version:       4.0.2
-Release:       3
+Version:       4.0.3
+Release:       1
 License:       Alladin Free Public License
 Group:         Libraries
 Source0:       http://www.pdflib.com/pdflib/download/%{name}-%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-shared-libs.patch
+URL:           http://www.pdflib.com/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libtiff-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 0:1.4.2-9
 BuildRequires: perl-devel >= 5.6.1
 BuildRequires: python-devel >= 2.2
 BuildRequires: python-modules >= 2.2
 BuildRequires: tcl-devel
 BuildRequires: zlib-devel
-URL:           http://www.pdflib.com/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -113,11 +113,7 @@ Statyczna biblioteka pdflib.
 %{__libtoolize}
 aclocal --output=config/aclocal.m4
 %{__autoconf}
-if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
-       CPPFLAGS="`pkg-config libpng12 --cflags`"
-fi
-
-%configure CPPFLAGS="$CPPFLAGS" \
+%configure \
        --enable-cxx \
        --enable-shared-pdflib \
        --with-py=%{py_sitedir} --with-pyincl=%{py_incdir} \
@@ -132,14 +128,6 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# arrrghh!!! libtool 1.4 supports linking with non-installed library,
-# but without DESTDIR! use hack to avoid "relinking" (which requires
-# libpdf already installed in /usr/lib).
-for f in bind/{perl/pdflib_pl,python/pdflib_py,tcl/pdflib_tcl}.la ; do
-       sed -e '/^relink_command=/d' $f > $f.new
-       mv -f $f.new $f
-done
-
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 install ./bind/cpp/pdflib.hpp $RPM_BUILD_ROOT%{_includedir}
@@ -152,11 +140,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc readme.txt doc/{changes,compatibility,readme_unix}.txt
+%doc doc/aladdin-license.pdf
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc readme.txt doc/{readme_unix,compatibility}.txt
+%doc doc/PDFlib-manual.pdf
+%attr(755,root,root) %{_bindir}/pdflib-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
 %{_includedir}/pdflib.h