rpms/Inventor/devel Inventor.spec,1.21,1.22

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20186

Modified Files:
	Inventor.spec 
Log Message:
Next attempt.


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Inventor.spec	22 Nov 2005 02:38:32 -0000	1.21
+++ Inventor.spec	8 Dec 2005 04:11:12 -0000	1.22
@@ -33,11 +33,16 @@
 # Declare SoTempPath forward
 Patch8:		Inventor-SoPath.diff
 
+# Work around to RH shipping a broken libGLw
+# - PR #173879: libGLw headers missing
+# - PR #175251: libGLw missing motif
+Patch10:	Inventor-redhat-bugs.diff
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  mesa-libGLU-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:	mesa-libGLw-devel
+BuildRequires:  libGLU-devel
+BuildRequires:  libGL-devel
+BuildRequires:	libGLw-devel
 BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 # Work around to RH shipping libXext without headers
@@ -135,6 +140,8 @@
 %patch7 -p0
 %patch8 -p1
 
+%patch10 -p1
+
 grep -Rl __ia64 lib* | while read a; do \
   sed -i -e 's,__ia64,__ia64__,g' \
   -e 's,__ia64____,__ia64__,g' \
@@ -228,6 +235,9 @@
 install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
 mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
+# testing
+exit 1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -306,8 +316,9 @@
 %{_libdir}/Inventor/examples
 
 %changelog
-* Mon Nov 21 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-14
+* Tue Dec 8 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-14
 - Attempt to build against modular X.
+- Add Inventor-redhat-bugs patch.
 
 * Tue Aug 03 2005 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-13
 - Let PPC use standard RPM_OPT_FLAGS.