devel/Inventor Inventor.spec,1.4,1.5

[Thorsten Leemhuis (thl)]

Author: thl

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

Modified Files:
	Inventor.spec 
Log Message:
Add specfile-patch from Andy Loening to fix build on x86_64 (rhb#147267); Add missing changelog entry for 2.1.5-6


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/devel/Inventor/Inventor.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Inventor.spec	14 Feb 2005 01:23:52 -0000	1.4
+++ Inventor.spec	16 Feb 2005 18:45:21 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           Inventor
 Version:        2.1.5
-Release:        6
+Release:        7
 Summary:        SGI Open Inventor (TM)
 
 Group:          System Environment/Libraries
@@ -124,16 +124,17 @@
 -e 's,^_DATADIR =.*$,_DATADIR = %{_datadir}/%{name}/data/models,' \
 -e 's,^_MATERIALSDIR =.*$,_MATERIALSDIR = %{_datadir}/%{name}/data/materials,' \
 -e 's,^_TEXTURESDIR =.*$,_TEXTURESDIR = %{_datadir}/%{name}/data/textures,' \
--e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_prefix}/lib/Inventor,' \
+-e 's,^_DEMOBINDIR =.*$,_DEMOBINDIR = %{_libdir}/Inventor,' \
 -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
 
 for i in apps/demos/*/*.RUNME; do \
   mv $i $i~
   sed \
     -e 's,/usr/share/inventor/,%{_datadir}/%{name}/,g' \
-    -e 's,/usr/lib/inventor/,%{_prefix}/lib/Inventor/,g' \
+    -e 's,/usr/lib/inventor/,%{_libdir}/Inventor/,g' \
     < $i~ > $i
 done
 
@@ -143,6 +144,7 @@
     -e 's, at exec_prefix@,%_exec_prefix,g' \
     -e 's, at includedir@,%_includedir,g' \
     -e 's, at libdir@,%_libdir,g' \
+    -e 's,X11R6/lib,X11R6/%_lib,g' \
     < $i > $(basename $i .in)
 done
 
@@ -179,7 +181,7 @@
   mv $a~ $a;
 done
 find -name '*.c++' | while read a; do \
-  sed -e "s,/usr/share/src/Inventor/examples/data,%{_prefix}/lib/Inventor/examples/data,g" < $a > $a~
+  sed -e "s,/usr/share/src/Inventor/examples/data,%{_libdir}/Inventor/examples/data,g" < $a > $a~
   mv $a~ $a;
 done
 sed -e '/^IVLIBHDRDIRS.*/,/libSoXt\/include/c\
@@ -201,8 +203,8 @@
 install -m644 libInventor.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
 install -m644 libInventorXt.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
 
-install -d m755 ${RPM_BUILD_ROOT}%{_prefix}/lib/Inventor
-mv devel-docs ${RPM_BUILD_ROOT}%{_prefix}/lib/Inventor/examples
+install -d m755 ${RPM_BUILD_ROOT}%{_libdir}/Inventor
+mv devel-docs ${RPM_BUILD_ROOT}%{_libdir}/Inventor/examples
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -273,15 +275,21 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/data
 %{_datadir}/%{name}/data/demos
-%dir %{_prefix}/lib/Inventor
-%{_prefix}/lib/Inventor/[^e]*
+%dir %{_libdir}/Inventor
+%{_libdir}/Inventor/[^e]*
 
 %files examples
 %defattr(-,root,root,-)
-%dir %{_prefix}/lib/Inventor
-%{_prefix}/lib/Inventor/examples
+%dir %{_libdir}/Inventor
+%{_libdir}/Inventor/examples
 
 %changelog
+* 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)
+
+* Mon Feb 14 2005 David Woodhouse <dwmw2 infradead org> - 2.1.5-6
+- Work around gcc bug by backing down to -O1 on ppc
+
 * Mon Sep 6 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-0.fdr.5
 - Add ivAddVP ivnorm ivperf to Inventor rsp. InventorXt.
 - Remove BuildRequires: tcsh.