From f5ed65649eee8b0ce04a47123be246a3475a41ea7a2f37c37abc06feb7546664 Mon Sep 17 00:00:00 2001
From: Angelos Tzotsos <tzotsos@gmail.com>
Date: Mon, 8 Oct 2012 19:13:10 +0000
Subject: [PATCH] removed java package temporarily

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=92
---
 mapserver.changes |  5 +++++
 mapserver.spec    | 37 +++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/mapserver.changes b/mapserver.changes
index c971614..79d1312 100644
--- a/mapserver.changes
+++ b/mapserver.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct  8 18:50:12 UTC 2012 - tzotsos@opensuse.org
+
+- Disabled Java build due to openJDK7 failures
+
 -------------------------------------------------------------------
 Tue May 22 19:56:53 UTC 2012 - tzotsos@opensuse.org
 
diff --git a/mapserver.spec b/mapserver.spec
index 9e37d88..c812e6b 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -64,6 +64,7 @@ BuildRequires:  java-1_5_0-ibm-alsa
 BuildRequires:  krb5-devel
 %endif
 BuildRequires:  libgcj-devel
+BuildRequires:  patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Patch:           mapserver-6.0.2_buildfix.patch
 
@@ -106,14 +107,14 @@ Requires:       python-base
 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}
+#%package java
+#Summary:        Java/Mapscript map making extensions to Java
+#Group:          Development/Languages
+#Requires:       %{name} = %{version}-%{release}
 
-%description java
-The Java/Mapscript extension provides full map customization capabilities
-within the Java programming language.
+#%description java
+#The Java/Mapscript extension provides full map customization capabilities
+#within the Java programming language.
 
 %prep
 %setup -q -n %{name}-%{fileversion}
@@ -164,9 +165,9 @@ cd ../python
 python setup.py build
 
 # build java
-cd ../java
-make interface
-make
+#cd ../java
+#make interface
+#make
 
 %install
 rm -rf %{buildroot}
@@ -202,8 +203,8 @@ mv %{buildroot}/usr/local/%{_lib}/python%py_ver/site-packages/*mapscript* %{buil
 popd
 
 # install java
-mkdir -p %{buildroot}%{_javadir}
-install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
+#mkdir -p %{buildroot}%{_javadir}
+#install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
 
 # install php config file
 mkdir -p %{buildroot}%{_sysconfdir}/php5/conf.d/
@@ -261,11 +262,11 @@ 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