simplify jdk BR

[packages/pdflib.git] / pdflib.spec

diff --git a/pdflib.spec b/pdflib.spec
index 85acfb90474c193ff870622da58841a0b8122f55..4ac1e28c4da0628d850868fdbfa815e105a9f7d9 100644 (file)
--- a/pdflib.spec
+++ b/pdflib.spec
@@ -14,12 +14,13 @@
 
 %define                skip_post_check_so      pdflib_pl.so.0.0.0 pdflib_tcl.so.0.0.0 pdflib_py.so.0.0.0
 
-%include       /usr/lib/rpm/macros.perl
+%{?with_java:%{?use_default_jdk}}
+
 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:       38
+Release:       45
 License:       Aladdin Free Public License
 Group:         Libraries
 Source0:       %{name}-%{version}.tar.gz
@@ -32,10 +33,12 @@ Patch4:             %{name}-ac.patch
 Patch5:                %{name}-build.patch
 Patch6:                %{name}-libpng.patch
 Patch7:                format-security.patch
-URL:           http://www.pdflib.com/
+Patch8:                %{name}-flags.patch
+Patch9:                java-paths.patch
+URL:           https://www.pdflib.com/
 BuildRequires: autoconf
 BuildRequires: automake
-%{?with_java:BuildRequires:    jdk >= 1.4}
+%{?with_java:%buildrequires_jdk}
 BuildRequires: libpng-devel >= 1.0.8
 BuildRequires: libtiff-devel
 BuildRequires: libtool >= 1:1.4.2-9
@@ -44,6 +47,7 @@ BuildRequires:        python-devel >= 2.2
 BuildRequires: python-modules >= 2.2
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 2.021
 BuildRequires: tcl-devel
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -108,7 +112,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 +125,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 +139,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 +157,8 @@ Dowiązania pythona dla pdflib.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 %{__libtoolize}
@@ -161,7 +167,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} \
@@ -173,10 +178,14 @@ Dowiązania pythona dla pdflib.
        --with-pnglib \
        --with-tifflib
 
-%{__make}
+%{__make} \
+       JAVA="%{java_home}/bin/java" \
+       JAVAC="%{java_home}/bin/javac" \
+       JAR="%{java_home}/bin/jar"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -185,10 +194,10 @@ cp -p bind/cpp/pdflib.hpp $RPM_BUILD_ROOT%{_includedir}
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
 cp -p bind/java/pdflib.jar $RPM_BUILD_ROOT%{_javadir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libpdf_java.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpdf_java.{la,a}
 %endif
 
-rm -f $RPM_BUILD_ROOT{%{perl_vendorarch},%{_libdir}/tcl*/pdflib,%{py_libdir}/lib-dynload}/pdflib*.{la,a}
+%{__rm} $RPM_BUILD_ROOT{%{perl_vendorarch},%{_libdir}/tcl*/pdflib,%{py_libdir}/lib-dynload}/pdflib*.{la,a}
 
 # ensure soname deps are generated
 find $RPM_BUILD_ROOT -name '*.so*' | xargs chmod +x