rpms/Inventor/FC-3 Inventor.spec,1.5,1.6

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/extras/rpms/Inventor/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5471

Modified Files:
	Inventor.spec 
Log Message:
Sync with devel


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-3/Inventor.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Inventor.spec	16 Feb 2005 18:45:21 -0000	1.5
+++ Inventor.spec	25 May 2005 14:59:05 -0000	1.6
@@ -1,6 +1,13 @@
+#
+# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
 Name:           Inventor
 Version:        2.1.5
-Release:        7
+Release:        11%{?dist}
+
 Summary:        SGI Open Inventor (TM)
 
 Group:          System Environment/Libraries
@@ -26,7 +33,8 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libGL.so.1 XFree86-devel
+BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:	xorg-x11-devel
 BuildRequires:	openmotif-devel freetype-devel libjpeg-devel
 BuildRequires:	bison
 # Workaround to RH shipping bison with broken package dependencies
@@ -48,7 +56,8 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	libGL.so.1 freetype-devel libjpeg-devel
+Requires:	xorg-x11-devel
+Requires:	freetype-devel libjpeg-devel
 
 %description    devel
 SGI Open Inventor (TM) development files.
@@ -58,10 +67,9 @@
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	libGL.so.1
 
 %description    -n InventorXt
-SGI Open Inventor development files.
+SGI Open Inventor (TM) development files.
 
 %package        -n InventorXt-devel
 Summary:        SGI Open Inventor (TM) Motif bindings.
@@ -73,7 +81,7 @@
 Requires:	openmotif-devel
 
 %description    -n InventorXt-devel
-SGI Open Inventor development files.
+SGI Open Inventor (TM) development files.
 
 %package	demos
 Summary:	SGI Open Inventor (TM) Demos
@@ -111,8 +119,14 @@
 %patch6 -p0 -b .orig
 %patch7 -p0
 
-mv make/ivcommondefs make/ivcommondefs~
-sed \
+grep -Rl __ia64 lib* | while read a; do \
+  sed -i -e 's,__ia64,__ia64__,g' \
+  -e 's,__ia64____,__ia64__,g' \
+  -e 's,__ia64__,__ia64__ || __x86_64__,g' \
+  $a; 
+done
+
+sed -i \
 -e 's,^IVPREFIX =.*$,IVPREFIX = %{_prefix},' \
 -e 's,^_BINDIR =.*$,_BINDIR = %{_bindir},' \
 -e 's,^_LIBDIR =.*$,_LIBDIR = %{_libdir},' \
@@ -128,14 +142,13 @@
 -e 's,^_DEMODATADIR =.*$,_DEMODATADIR = %{_datadir}/%{name}/data/demos,' \
 -e 's,^OPTIMIZER = -O -DNDEBUG,OPTIMIZER = -DNDEBUG,' \
 -e 's,(X11DIR)/lib,(X11DIR)/%_lib,g' \
-< make/ivcommondefs~ > make/ivcommondefs
+make/ivcommondefs
 
 for i in apps/demos/*/*.RUNME; do \
-  mv $i $i~
-  sed \
+  sed -i \
     -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
     -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
-    < $i~ > $i
+    $i
 done
 
 for i in *.pc.in; do
@@ -177,17 +190,14 @@
 find \( -name '*~' -o -name '*.debian' \) -exec rm -f {} \;
 find -name 'GNUmakefile*' | while read a; do \
   b=`echo $a | sed 's,GNUmakefile.*$,,;s,^\./,,;s,[^/]*/,../,g;s,\/$,,;s,^$,.,'`
-  sed -e "s,^IVDEPTH = .*$,IVDEPTH = $b," < $a > $a~;
-  mv $a~ $a;
+  sed -i -e "s,^IVDEPTH = .*$,IVDEPTH = $b," $a
 done
 find -name '*.c++' | while read a; do \
-  sed -e "s,/usr/share/src/Inventor/examples/data,%{_libdir}/Inventor/examples/data,g" < $a > $a~
-  mv $a~ $a;
+  sed -i -e "s,/usr/share/src/Inventor/examples/data,%{_libdir}/Inventor/examples/data,g" $a
 done
-sed -e '/^IVLIBHDRDIRS.*/,/libSoXt\/include/c\
+sed -i -e '/^IVLIBHDRDIRS.*/,/libSoXt\/include/c\
 IVLIBHDRS = `pkg-config --cflags libInventorXt`' \
-< make/ivcommondefs > make/ivcommondefs~
-mv make/ivcommondefs~ make/ivcommondefs
+make/ivcommondefs
 make clean
 popd > /dev/null
 
@@ -284,6 +294,18 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Sun May 22 2005 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-9
+- Increment release in an attempt to please build system.
+
+* Sun May 22 2005 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-8
+- Use BR: xorg-x11-* instead of *.so.1 to work around rpm's brain-dead
+  SONAME handling.
+- Add %%dist.
+- Use sed -i to avoid temporary files.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Wed Feb 16 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.1.5-7
 - Add specfile-patch from Andy Loening to fix build on x86_64 (rhb#147267)
 
@@ -314,5 +336,5 @@
 
 * Wed Jun 30 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.1
 - Initial Fedora Extras RPM.
-- Adopt Debian/Testing patches (Thanks to Steve M. Robbins for keeping 
+- Adopt Debian/Testing patches (Thanks to Steve M. Robbins for keeping
   Inventor alive).