summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Horák <dan@danny.cz>2012-10-25 10:07:51 (GMT)
committerDan Horák <dan@danny.cz>2012-10-25 10:08:27 (GMT)
commit366f5154a6a68be7d3ea967779b22a82ccf43d32 (patch)
treed2b5051470f964b57c8511c8e310dc3d25c0aa49
parentc66414a9d662b9282449847ed7308e1c57c611d8 (diff)
downloadlibgda-366f5154a6a68be7d3ea967779b22a82ccf43d32.zip
libgda-366f5154a6a68be7d3ea967779b22a82ccf43d32.tar.gz
libgda-366f5154a6a68be7d3ea967779b22a82ccf43d32.tar.xz
fix Java detection on secondary arches
-rw-r--r--libgda.spec33
1 files changed, 32 insertions, 1 deletions
diff --git a/libgda.spec b/libgda.spec
index 6b9493f..103c9fa 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -11,7 +11,7 @@
Name: libgda
Epoch: 1
Version: 5.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library for writing gnome database programs
License: LGPLv2+
@@ -190,12 +190,40 @@ touch -r AUTHORS AUTHORS.new && mv AUTHORS.new AUTHORS
%build
# set LD_LIBRARY_PATH manually since it fails to find libjvm with_java7
%if 0%{?with_java}
+# this list should match the setup in java-1.7.0-openjdk.spec
+# or getsp.java should be fixed
%ifarch x86_64
%global archinstall amd64
%endif
%ifarch %{ix86}
%global archinstall i386
%endif
+%ifarch ppc
+%global archinstall ppc
+%endif
+%ifarch ppc64
+%global archinstall ppc64
+%endif
+%ifarch ia64
+%global archinstall ia64
+%endif
+%ifarch s390
+%global archinstall s390
+%endif
+%ifarch s390x
+%global archinstall s390x
+%endif
+%ifarch %{arm}
+%global archinstall arm
+%endif
+# 32 bit sparc, optimized for v9
+%ifarch sparcv9
+%global archinstall sparc
+%endif
+# 64 bit sparc
+%ifarch sparc64
+%global archinstall sparcv9
+%endif
export LD_LIBRARY_PATH=/usr/lib/jvm/java/jre/lib/%{archinstall}/server:$LD_LIBRARY_PATH
%endif
# vala support has not been tested yet so it is not enabled yet
@@ -362,6 +390,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
+* Thu Oct 25 2012 Dan Horák <dan[at]danny.cz> - 1:5.1.1-4
+- fix Java detection on secondary arches
+
* Wed Oct 24 2012 Kalev Lember <kalevlember@gmail.com> - 1:5.1.1-3
- Enable introspection (#869072)