rpms/Inventor/FC-5 .cvsignore, 1.3, 1.4 Inventor.spec, 1.32, 1.33 sources, 1.3, 1.4

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
* Mon Oct 02 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-23
- Add make-var _PDFVIEWER.
- Backport to FC4.
- Fix path to chessboard.iv in chesschairs.iv.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Sep 2006 09:00:00 -0000	1.3
+++ .cvsignore	2 Oct 2006 04:46:03 -0000	1.4
@@ -1,2 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
-Inventor-2.1.5-22.diff
+Inventor-2.1.5-23.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/Inventor.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Inventor.spec	28 Sep 2006 09:00:00 -0000	1.32
+++ Inventor.spec	2 Oct 2006 04:46:03 -0000	1.33
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        22%{?dist}
+Release:        23%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,14 +14,22 @@
 License:        LGPL
 URL:            http://oss.sgi.com/projects/inventor/
 Source0:        ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
-Patch0:		Inventor-2.1.5-22.diff
+Patch0:		Inventor-2.1.5-23.diff.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{?fedora}" < "5"
+BuildRequires:  xorg-x11-Mesa-libGLU
+BuildRequires:  xorg-x11-Mesa-libGL
+BuildRequires:  xorg-x11-devel
+%endif
+
 BuildRequires:  libGLU-devel
+%if "%{?fedora}" >= "5"
 BuildRequires:	libGLw-devel
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
+%endif
 
 %if "%{?fedora}" >= "6"
 BuildRequires:	lesstif-devel
@@ -157,6 +165,8 @@
     < $i > $(basename $i .in)
 done
 
+rm -f data/models/scenes/chesschairs.iv
+
 %build
 # Inventor's build system wants us to install and build everything at once.
 rm -rf $RPM_BUILD_ROOT
@@ -171,7 +181,7 @@
   LSUBDIRS="lib libSoXt"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} BUILDMAN=1 \
-  LSUBDIRS="doc data apps"
+  LSUBDIRS="doc apps data"
 
 # convert Mentor and Toolmaker examples into a standalone package
 rm -rf devel-docs
@@ -284,6 +294,11 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Mon Oct 02 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-23
+- Add make-var _PDFVIEWER.
+- Backport to FC4.
+- Fix path to chessboard.iv in chesschairs.iv.
+
 * Thu Sep 25 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-22
 - Misc minor fixes.
 - Add dep to xmessage.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2006 09:00:00 -0000	1.3
+++ sources	2 Oct 2006 04:46:03 -0000	1.4
@@ -1,2 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
-6fa640c31471056a882c536a41040a71  Inventor-2.1.5-22.diff
+c8e1cbcc3ae9f51f97940b06d522bd47  Inventor-2.1.5-23.diff.bz2