rpms/openvrml/F-11 openvrml.spec,1.68,1.69

[Braden McDaniel]

Author: braden

Update of /cvs/pkgs/rpms/openvrml/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15308/F-11

Modified Files:
	openvrml.spec 
Log Message:
Arch-independent Requires are not safe for multilib systems when a specific architecture is needed.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/F-11/openvrml.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- openvrml.spec	13 Aug 2009 07:37:40 -0000	1.68
+++ openvrml.spec	28 Sep 2009 04:29:08 -0000	1.69
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -24,8 +24,8 @@ BuildRequires:  gtkglext-devel
 BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
-Requires:       gecko-libs%{?_isa} >= 1.9.1
-Requires:       java%{?_isa}
+Requires:       xulrunner%{?_isa} >= 1.9.1
+Requires:       java-1.6.0-openjdk%{?_isa}
 
 %description
 OpenVRML is a VRML/X3D support library, including a runtime and facilities
@@ -35,9 +35,9 @@ for reading and displaying VRML and X3D 
 %package devel
 Summary:        Headers for developing C++ programs with OpenVRML
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
-Requires:       boost-devel >= 1.37.0
+Requires:       boost-devel%{?_isa} >= 1.37.0
 %description devel
 Headers that programmers will need to develop C++ programs using
 OpenVRML.
@@ -45,17 +45,17 @@ OpenVRML.
 %package gl
 Summary:        OpenGL renderer for OpenVRML
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 %description gl
 OpenGL renderer for OpenVRML.
 
 %package gl-devel
 Summary:        OpenVRML OpenGL renderer headers
 Group:          Development/Libraries
-Requires:       %{name}-gl = %{version}-%{release}
-Requires:       %{name}-devel = %{version}-%{release}
+Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig >= 0.18.0
-Requires:       libGLU-devel
+Requires:       libGLU-devel%{?_isa}
 %description gl-devel
 Headers that programmers will need to develop C++ programs using the
 OpenVRML OpenGL renderer.
@@ -64,7 +64,7 @@ OpenVRML OpenGL renderer.
 Summary:        VRML/X3D browser XEmbed component for embedding in X11 applications
 Group:          Applications/Internet
 License:        GPLv3+
-Requires:       %{name}-gl = %{version}-%{release}
+Requires:       %{name}-gl%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-gtkplug
 %description xembed
 VRML/X3D browser XEmbed component for embedding in X11 applications.
@@ -182,12 +182,16 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %dir %{_datadir}/openvrml-player
 %dir %{_datadir}/openvrml-player/ui
 %{_datadir}/openvrml-player/ui/openvrml-player.ui
-  
+
 %files doc
 %doc doc/manual
 %{_javadocdir}/%{name}-%{version}
-  
+
 %changelog
+* Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-2
+- Arch-independent Requires are not safe for multilib systems when a
+  specific architecture is needed.
+
 * Thu Aug 13 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-1
 - Updated to 0.18.3.