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 - 1:5.1.1-4 +- fix Java detection on secondary arches + * Wed Oct 24 2012 Kalev Lember - 1:5.1.1-3 - Enable introspection (#869072)