From a3c94f80fb1678fa3ec9da9a1dde4819618ebfff220e323135f867b5a6b06a58 Mon Sep 17 00:00:00 2001 From: Angelos Tzotsos Date: Sun, 22 Apr 2012 17:33:41 +0000 Subject: [PATCH] Accepting request 114959 from home:tzotsos:test:mapserver SLES build fixed OBS-URL: https://build.opensuse.org/request/show/114959 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=90 --- ...-6.0.1_buildfix.patch => mapserver-6.0.2_buildfix.patch | 0 mapserver.changes | 5 +++++ mapserver.spec | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) rename mapserver-6.0.1_buildfix.patch => mapserver-6.0.2_buildfix.patch (100%) diff --git a/mapserver-6.0.1_buildfix.patch b/mapserver-6.0.2_buildfix.patch similarity index 100% rename from mapserver-6.0.1_buildfix.patch rename to mapserver-6.0.2_buildfix.patch diff --git a/mapserver.changes b/mapserver.changes index f9edc27..d1402d4 100644 --- a/mapserver.changes +++ b/mapserver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 22 07:49:04 UTC 2012 - tzotsos@opensuse.org + +- fixed SLE_11 SP1 build + ------------------------------------------------------------------- Tue Apr 17 21:42:26 UTC 2012 - tzotsos@opensuse.org diff --git a/mapserver.spec b/mapserver.spec index cb53323..b98ce5e 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -50,8 +50,13 @@ BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: swig BuildRequires: update-alternatives BuildRequires: apache2-devel +%if 0%{?sles_version} +BuildRequires: java-devel <= 1.5 +BuildRequires: java <= 1.5 +%else BuildRequires: java-devel >= 1.5 BuildRequires: java >= 1.5 +%endif %if 0%{?sles_version} == 10 %ifarch i586 BuildRequires: java-1_5_0-ibm-alsa @@ -60,7 +65,7 @@ BuildRequires: krb5-devel %endif BuildRequires: libgcj-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Patch: mapserver-6.0.1_buildfix.patch +Patch: mapserver-6.0.2_buildfix.patch %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %define _cgibindir /srv/www/cgi-bin