rpms/openvrml/devel openvrml.spec,1.72,1.73

[Braden McDaniel]

Author: braden

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

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/devel/openvrml.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- openvrml.spec	12 Sep 2009 20:26:23 -0000	1.72
+++ openvrml.spec	28 Sep 2009 04:29:09 -0000	1.73
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -19,20 +19,13 @@ BuildRequires:  freetype-devel >= 2.1.2
 BuildRequires:  gecko-devel >= 1.9.1
 BuildRequires:  glib2-devel >= 2.6
 BuildRequires:  dbus-glib-devel
-BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  gtk2-devel >= 2.12
 BuildRequires:  gtkglext-devel
+BuildRequires:  libgnomeui-devel >= 2.14
 BuildRequires:  curl-devel
 BuildRequires:  java-devel
-# You cannot use %%{?isa} to map these requires to an architecture target
-# The only Requires which have %%{?isa} are those matching the name of the package
-# Since both "gecko-libs" and "java" are not the name of the packages that provide them
-# (they're manually defined Provides) they do not have %%{?isa}. You should ask the maintainer
-# of those packages to add explicit provides that use %%{?isa} (in addition to the normal ones).
-# Alternately, you could use a file dependency here, at least for "java", to force an architecture
-# match. -Tom Callaway <tcallawa at redhat.com>
-Requires:       gecko-libs >= 1.9.1
-Requires:       java
+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
@@ -42,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.
@@ -52,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.
@@ -71,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.
@@ -195,6 +188,10 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Mon Sep 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.18.3-4
+- Arch-independent Requires are not safe for multilib systems when a
+  specific architecture is needed.
+
 * Sat Sep 12 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 0.18.3-3
 - undo arch-specific deps on gecko-libs and java (%%{?isa} doesn't work like you think it works)
   for more details, see the comment in the spec file