- added flags patch to use LDFLAGS (for as-needed support); release 43

diff --git a/pdflib-flags.patch b/pdflib-flags.patch
new file mode 100644 (file)
index 0000000..34aa7b3
--- /dev/null
+++ b/pdflib-flags.patch
@@ -0,0 +1,91 @@
+--- pdflib-4.0.3/bind/java/Makefile.in.orig    2022-07-29 20:01:45.083593872 +0200
++++ pdflib-4.0.3/bind/java/Makefile.in 2022-07-29 20:15:27.449138735 +0200
+@@ -35,6 +35,8 @@ SWIG_LIB     = libpdf_java.la
+ SWIG_OBJ      = pdflib_java.lo
+ 
+ DEFINES                = -I../../pdflib @JAVAINCLUDE@ @DEFINES@ 
++CPPFLAGS      = @CPPFLAGS@
++LDFLAGS               = @LDFLAGS@
+ 
+ all:  $(SWIG_LIB) pdflib.jar
+ 
+@@ -48,7 +50,7 @@ swig: ../../pdflib/pdflib.i ../../pdflib
+ # The actual shared library for the language support
+ $(SWIG_LIB): ../../pdflib/pdflib.h ../../pdflib/$(LIBPDF).la $(SWIG_OBJ)
+       $(RM) $(SWIG_LIB)
+-      $(LIBTOOL) --mode=link $(CC) -o $@ $(SWIG_OBJ) -rpath $(LANG_LIBDIR) -module $(PDFLIBCONVENIENT)
++      $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SWIG_OBJ) -rpath $(LANG_LIBDIR) -module $(PDFLIBCONVENIENT)
+       @-if test -f .libs/libpdf_java.dylib; then                      \
+           ln .libs/libpdf_java.dylib .libs/libpdf_java.jnilib;        \
+       fi
+--- pdflib-4.0.3/bind/perl/Makefile.in.orig    2022-07-29 20:01:45.083593872 +0200
++++ pdflib-4.0.3/bind/perl/Makefile.in 2022-07-29 20:16:16.212207896 +0200
+@@ -35,6 +35,8 @@ SWIG_LIB     = pdflib_pl.la
+ SWIG_OBJ      = pdflib_pl.lo
+ 
+ DEFINES               = @PERLBOOLDEF@ -I../../pdflib @PERLINCLUDE@ @DEFINES@ 
++CPPFLAGS      = @CPPFLAGS@
++LDFLAGS               = @LDFLAGS@
+ 
+ all:  $(SWIG_LIB)
+ 
+@@ -48,7 +50,7 @@ swig: ../../pdflib/pdflib.i ../../pdflib
+ # The actual shared library for the language support
+ $(SWIG_LIB): $(SWIG_OBJ) ../../pdflib/$(LIBPDF).la ../../pdflib/pdflib.h
+       $(RM) $(SWIG_LIB)
+-      $(LIBTOOL) --mode=link $(CC) -o $@ $(SWIG_OBJ) -rpath $(LANG_LIBDIR) -module $(PDFLIBCONVENIENT)
++      $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SWIG_OBJ) -rpath $(LANG_LIBDIR) -module $(PDFLIBCONVENIENT)
+ 
+ test: all
+       -$(PERLBIN) hello.pl
+--- pdflib-4.0.3/bind/python/Makefile.in.orig  2022-07-29 20:01:45.083593872 +0200
++++ pdflib-4.0.3/bind/python/Makefile.in       2022-07-29 20:18:14.148235649 +0200
+@@ -33,6 +33,8 @@ SWIG_LIB     = pdflib_py.la
+ SWIG_OBJ      = pdflib_py.lo
+ 
+ DEFINES       = -I../../pdflib @PYINCLUDE@ @DEFINES@
++CPPFLAGS      = @CPPFLAGS@
++LDFLAGS               = @LDFLAGS@
+ 
+ all:  $(SWIG_LIB)
+ 
+@@ -46,7 +48,7 @@ swig: ../../pdflib/pdflib.i ../../pdflib
+ # The actual shared library for the language support
+ $(SWIG_LIB): $(SWIG_OBJ) ../../pdflib/$(LIBPDF).la ../../pdflib/pdflib.h
+       $(RM) $(SWIG_LIB)
+-      $(LIBTOOL) --mode=link $(CC) -o $@ $(SWIG_OBJ) -rpath $(LANG_LIBDIR) -module $(PDFLIBCONVENIENT)
++      $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SWIG_OBJ) -rpath $(LANG_LIBDIR) -module $(PDFLIBCONVENIENT)
+       @-if test -f .libs/libpdflib_py.dylib; then             \
+           ln .libs/libpdflib_py.dylib .libs/pdflib_py.so;     \
+       fi
+--- pdflib-4.0.3/bind/tcl/Makefile.in.orig     2022-07-29 20:01:45.083593872 +0200
++++ pdflib-4.0.3/bind/tcl/Makefile.in  2022-07-29 20:18:44.164739702 +0200
+@@ -34,6 +34,8 @@ SWIG_LIB     = pdflib_tcl.la
+ SWIG_OBJ      = pdflib_tcl.lo
+ 
+ DEFINES               = -I../../pdflib @TCLINCLUDE@ @DEFINES@
++CPPFLAGS      = @CPPFLAGS@
++LDFLAGS               = @LDFLAGS@
+ 
+ all:  $(SWIG_LIB)
+ 
+@@ -47,7 +49,7 @@ swig: ../../pdflib/pdflib.i ../../pdflib
+ # The actual shared library for the language support
+ $(SWIG_LIB): $(SWIG_OBJ) ../../pdflib/$(LIBPDF).la ../../pdflib/pdflib.h
+       $(RM) $(SWIG_LIB)
+-      $(LIBTOOL) --mode=link $(CC) -o $@ $(SWIG_OBJ) -rpath $(LANG_LIBDIR) -module $(PDFLIBCONVENIENT)
++      $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SWIG_OBJ) -rpath $(LANG_LIBDIR) -module $(PDFLIBCONVENIENT)
+       @-if test -f .libs/libpdflib_tcl.dylib; then                    \
+           ln .libs/libpdflib_tcl.dylib .libs/pdflib_tcl.dylib;        \
+       fi
+--- pdflib-4.0.3/pdflib/Makefile.in.orig       2022-07-29 20:01:45.093593817 +0200
++++ pdflib-4.0.3/pdflib/Makefile.in    2022-07-29 20:19:11.854589693 +0200
+@@ -28,6 +28,8 @@ PNGLIBINC    = @PNGLIBINC@
+ PDFLIBLINKSELF        = @PDFLIBLINKSELF@
+ 
+ CFLAGS                = @DEFS@ @DEFINES@ $(TIFFLIBINC) $(ZLIBINC) $(PNGLIBINC)
++CPPFLAGS      = @CPPFLAGS@
++LDFLAGS               = @LDFLAGS@
+ 
+ .SUFFIXES: .c .$(OBJ) .lo
+ 

diff --git a/pdflib.spec b/pdflib.spec
index 05a8b38338474e5cc1bd12e782aff03b6ad59ba5..eb61cb5fa0acf37e577f159b76b948f750c4f95d 100644 (file)
--- a/pdflib.spec
+++ b/pdflib.spec
@@ -18,7 +18,7 @@ Summary:      Portable C library for dynamically generating PDF files
 Summary(pl.UTF-8):     Przenośna biblioteka C do dynamicznego generowania plików PDF
 Name:          pdflib
 Version:       4.0.3
-Release:       42
+Release:       43
 License:       Aladdin Free Public License
 Group:         Libraries
 Source0:       %{name}-%{version}.tar.gz
@@ -31,6 +31,7 @@ Patch4:               %{name}-ac.patch
 Patch5:                %{name}-build.patch
 Patch6:                %{name}-libpng.patch
 Patch7:                format-security.patch
+Patch8:                %{name}-flags.patch
 URL:           https://www.pdflib.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -108,7 +109,7 @@ Summary:    Perl bindings for pdflib
 Summary(pl.UTF-8):     Dowiązania Perla do pdflib
 Group:         Development/Languages/Perl
 Requires:      %{name} = %{version}-%{release}
-Obsoletes:     pdflib-perl5
+Obsoletes:     pdflib-perl5 < 4.0.1
 
 %description perl
 Perl bindings for pdflib.
@@ -121,7 +122,7 @@ Summary:    Tcl bindings for pdflib
 Summary(pl.UTF-8):     Dowiązania Tcl do pdflib
 Group:         Development/Languages/Tcl
 Requires:      %{name} = %{version}-%{release}
-Obsoletes:     pdflib-tcl8.0
+Obsoletes:     pdflib-tcl8.0 < 4.0.1
 
 %description tcl
 Tcl bindings for pdflib.
@@ -135,7 +136,7 @@ Summary(pl.UTF-8):  Dowiązania pythona dla pdflib
 Group:         Development/Languages/Python
 Requires:      %{name} = %{version}-%{release}
 %pyrequires_eq python
-Obsoletes:     pdflib-python1.5
+Obsoletes:     pdflib-python1.5 < 4.0.1
 
 %description python
 Python bindings for pdflib.
@@ -153,6 +154,7 @@ Dowiązania pythona dla pdflib.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %{__libtoolize}
@@ -161,7 +163,6 @@ Dowiązania pythona dla pdflib.
 %configure \
        CFLAGS="-DUSE_INTERP_RESULT %{rpmcflags}" \
        --enable-cxx \
-       --enable-shared-pdflib \
        %{?with_java:--with-java=%{java_home}}%{!?with_java:--without-java} \
        --with-py=%{py_sitedir} \
        --with-pyincl=%{py_incdir} \
@@ -177,6 +178,7 @@ Dowiązania pythona dla pdflib.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT