[openvrml/f14/master] - use openjdk on s390(x)

Dan Horák sharkcz at fedoraproject.org
Fri Sep 24 10:53:58 UTC 2010


commit e59b743f44dcb8a718a6480d13e762628f61ee74
Author: Dan Horák <dan at danny.cz>
Date:   Fri Sep 24 12:53:59 2010 +0200

    - use openjdk on s390(x)

 openvrml.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/openvrml.spec b/openvrml.spec
index 8ba65a9..119b4df 100644
--- a/openvrml.spec
+++ b/openvrml.spec
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VRML/X3D player and runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -22,7 +22,11 @@ BuildRequires:  gtk2-devel >= 2.12
 BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
+%ifarch s390 s390x
+BuildRequires:  java-1.6.0-devel
+%else
 BuildRequires:  java-devel
+%endif
 Requires:       openvrml-player%{?_isa} = %{version}-%{release}
 Requires:       openvrml-mozilla-plugin%{?_isa} = %{version}-%{release}
 Requires:       openvrml-nodes%{?_isa} = %{version}-%{release}
@@ -232,6 +236,9 @@ CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden -Wno-missing
 %doc %{_datadir}/doc/libopenvrml-%{version}/manual
 
 %changelog
+* Thu Sep 24 2010  Dan Horák  <dan[at]danny.cz> - 0.18.6-4
+- use openjdk on s390(x)
+
 * Sat Sep 14 2010  Braden McDaniel  <braden at endoframe.com> - 0.18.6-3
 - Rebuild for the *real* boost-1.44.0.
 


More information about the scm-commits mailing list