From 5bad7b900a0b1b25a615d6085b2134c9de05ad70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Lis=C3=BD?= Date: Tue, 16 Oct 2012 12:38:06 +0200 Subject: [PATCH] temporary removed mapserver-java (mapscript) due to build problem with jdk7 --- .gitignore | 2 ++ mapserver.spec | 82 +++++++++++++++++++++++++++++++------------------- sources | 2 ++ 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 86e2b21..05168f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /mapserver-6.0.3.tar.gz +/mapserver-6.0.3-for-swig_2.0.4_up.patch +/mapserver-6.0.3-php4.patch diff --git a/mapserver.spec b/mapserver.spec index a9e0b6f..c153bdf 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -1,11 +1,15 @@ Name: mapserver Version: 6.0.3 -Release: 3%{?dist} +Release: 6%{?dist} Summary: Environment for building spatially-enabled internet applications Group: Development/Tools License: BSD URL: http://www.mapserver.org Source: http://download.osgeo.org/mapserver/mapserver-%{version}.tar.gz + +Patch0: mapserver-6.0.3-for-swig_2.0.4_up.patch +Patch1: mapserver-6.0.3-php4.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: httpd Requires: bitstream-vera-sans-fonts @@ -13,8 +17,8 @@ Requires: bitstream-vera-sans-fonts BuildRequires: libXpm-devel readline-devel BuildRequires: httpd-devel php-devel libxslt-devel pam-devel fcgi-devel BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: postgresql-devel mysql-devel java-devel -BuildRequires: swig > 1.3.24 java +BuildRequires: postgresql-devel mysql-devel swig > 1.3.24 +# BuildRequires: java java-devel BuildRequires: geos-devel proj-devel gdal-devel agg-devel cairo-devel BuildRequires: php-devel freetype-devel gd-devel >= 2.0.16 BuildRequires: python-devel curl-devel zlib-devel libxml2-devel @@ -58,18 +62,23 @@ Requires: %{name} = %{version}-%{release} The Python/Mapscript extension provides full map customization capabilities within the Python programming language. -%package java -Summary: Java/Mapscript map making extensions to Java -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Requires: java-gcj-compat - -%description java -The Java/Mapscript extension provides full map customization capabilities -within the Java programming language. +# %package java +# Summary: Java/Mapscript map making extensions to Java +# Group: Development/Languages +# Requires: %{name} = %{version}-%{release} +# Requires: java-gcj-compat +# +# %description java +# The Java/Mapscript extension provides full map customization capabilities +# within the Java programming language. %prep %setup -q +%if "%{fedora}" == "17" || "%{fedora}" == "18" || "%{fedora}" == "19" +%patch0 -p1 -b .swig +%patch1 -p1 -b .php4 +%endif + # fix spurious perm bits chmod -x tests/home.png chmod -x mapscript/php/php_mapscript.c @@ -95,12 +104,12 @@ popd CFLAGS="${CFLAGS} -ldl" ; export CFLAGS -# fix a UTF-8 one -iconv -f ISO-8859-1 -t UTF-8 < \ -mapscript/java/examples/QueryByAttributeUnicode.java > \ -mapscript/java/examples/QueryByAttributeUnicode-tmp.java -mv -f mapscript/java/examples/QueryByAttributeUnicode-tmp.java \ -mapscript/java/examples/QueryByAttributeUnicode.java +# # fix a UTF-8 one +# iconv -f ISO-8859-1 -t UTF-8 < \ +# mapscript/java/examples/QueryByAttributeUnicode.java > \ +# mapscript/java/examples/QueryByAttributeUnicode-tmp.java +# mv -f mapscript/java/examples/QueryByAttributeUnicode-tmp.java \ +# mapscript/java/examples/QueryByAttributeUnicode.java # fix gdal lookup %{__sed} -i.libs -e 's|`\$GDAL_CONFIG --dep-libs`||' configure @@ -155,10 +164,10 @@ make cd ../python python setup.py build -# build java -cd ../java -make interface -make +# # build java +# cd ../java +# make interface JAVA_HOME=/etc/alternatives/java_sdk +# make JAVA_HOME=/etc/alternatives/java_sdk %install rm -rf %{buildroot} @@ -185,9 +194,9 @@ pushd mapscript/python python setup.py install --root %{buildroot} popd -# install java -mkdir -p %{buildroot}%{_javadir} -install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/ +# # install java +# mkdir -p %{buildroot}%{_javadir} +# install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/ # install php config file mkdir -p %{buildroot}%{_sysconfdir}/php.d/ @@ -240,14 +249,25 @@ rm -rf %{buildroot} %doc mapscript/python/tests %{python_sitearch}/* -%files java -%defattr(-,root,root) -%doc mapscript/java/README -%doc mapscript/java/examples -%doc mapscript/java/tests -%{_javadir}/*.jar +# %files java +# %defattr(-,root,root) +# %doc mapscript/java/README +# %doc mapscript/java/examples +# %doc mapscript/java/tests +# %{_javadir}/*.jar %changelog +* Tue Oct 16 2012 Pavel Lisý - 6.0.3-6 +- temporary removed mapserver-java (mapscript) due to build problem + with jdk7 + +* Fri Oct 12 2012 Pavel Lisý - 6.0.3-5 +- Merged from 6.0.3-4 +- fix of build for php4 and swig > 2.0.4 + +* Tue Aug 14 2012 Devrim GÜNDÜZ - 6.0.3-4 +- Rebuilt for new perl. + * Thu Jul 19 2012 Fedora Release Engineering - 6.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 79eab88..9ec4146 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ +bd1e46195fdc236d9766d2c56030c12b mapserver-6.0.3-for-swig_2.0.4_up.patch +035a14531f3c100ff7031e212b2b3f38 mapserver-6.0.3-php4.patch 0d2ad6f56e8a1b5755e856a54f90071c mapserver-6.0.3.tar.gz