diff --git a/mapserver.spec b/mapserver.spec index 8fa9f3c..2b5d310 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -38,16 +38,16 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: swig -BuildRequires: java-devel >= 1.5 +BuildRequires: java-devel == 1.5 BuildRequires: update-alternatives BuildRequires: apache2-devel -BuildRequires: java >= 1.5 +BuildRequires: java == 1.5 %if 0%{?sles_version} == 10 %ifarch i586 BuildRequires: java-1_5_0-ibm-alsa %endif %endif -BuildRequires: libgcj-devel +BuildRequires: libgcj-devel == 1.5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # not needed fpr 5.4.0 #Patch: mapserver-5.2.1_buildchecks.patch @@ -277,6 +277,7 @@ rm -rf %{buildroot} http://trac.osgeo.org/mapserver/ticket/2943 http://trac.osgeo.org/mapserver/ticket/2944 - tweaked the specfile for the new relase a little +- make java using version 1.5 also for OpenSuSE 11.0 * Wed Dec 04 2008 Stephan Holl 5.2.1 - updated to new upstream release of mapserver 5.2.1 (see http://trac.osgeo.org/mapserver/browser/tags/rel-5-2-1/mapserver/HISTORY.TXT for a detailed description of the changes * Wed Oct 22 2008 Stephan Holl 5.2.0