- make it backportable

SILENT: svn-revision: 685496
This commit is contained in:
oden 2011-06-16 08:08:37 +00:00 committed by oden
parent 66f6caa9b4
commit 41b3ebff6c

View file

@ -1,3 +1,10 @@
%if %mandriva_branch == Cooker
%define release %mkrel 2
%else
%define subrel 1
%define release %mkrel 0
%endif
# Version of java # Version of java
%define javaver 1.6.0 %define javaver 1.6.0
@ -23,7 +30,7 @@
Name: icedtea-web Name: icedtea-web
Version: 1.0.2 Version: 1.0.2
Release: 1 Release: %{release}
Summary: Additional Java components for OpenJDK Summary: Additional Java components for OpenJDK
Group: Networking/WWW Group: Networking/WWW
License: LGPLv2+ and GPLv2 with exceptions License: LGPLv2+ and GPLv2 with exceptions
@ -49,7 +56,7 @@ Requires(postun): update-alternatives
Provides: java-plugin = %{javaver} Provides: java-plugin = %{javaver}
Provides: java-1.6.0-openjdk-plugin = 1.6.0.0-18.b22 Provides: java-1.6.0-openjdk-plugin = 1.6.0.0-18.b22
Obsoletes: java-1.6.0-openjdk-plugin < 1.6.0.0-18.b20 Obsoletes: java-1.6.0-openjdk-plugin
Patch0: icedtea-web-1.0.2-mutex_and_leak.patch Patch0: icedtea-web-1.0.2-mutex_and_leak.patch
@ -63,7 +70,9 @@ implementations.
Summary: API documentation for IcedTea-Web Summary: API documentation for IcedTea-Web
Group: Documentation Group: Documentation
Requires: jpackage-utils Requires: jpackage-utils
%if %mdkversion >= 201010
BuildArch: noarch BuildArch: noarch
%endif
%description javadoc %description javadoc
This package contains Javadocs for the IcedTea-Web project. This package contains Javadocs for the IcedTea-Web project.
@ -72,6 +81,12 @@ This package contains Javadocs for the IcedTea-Web project.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%if %mdkversion < 201000
# ugly hack to make it work on 2009.0/mes5 (pcpa)
perl -pi -e 's|AC_CANONICAL_HOST||;' configure.*
autoreconf -fi
%endif
%build %build
%configure2_5x \ %configure2_5x \
--with-pkgversion=mandriva-%{release}-%{_arch} \ --with-pkgversion=mandriva-%{release}-%{_arch} \