rpms/Inventor/devel .cvsignore, 1.9, 1.10 Inventor.spec, 1.43, 1.44 sources, 1.8, 1.9

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	.cvsignore Inventor.spec sources 
Log Message:
* Thu Jan 10 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-31
- Spec file cleanup.
- Introduce --with openmotif.
- Add Inventor-2.1.5-30-31.diff.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Inventor/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Nov 2007 04:05:11 -0000	1.9
+++ .cvsignore	10 Jan 2008 17:46:35 -0000	1.10
@@ -1,2 +1,3 @@
 inventor-2.1.5-10.src.tar.gz
 Inventor-2.1.5-30.diff.bz2
+Inventor-2.1.5-30-31.diff


Index: Inventor.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Inventor.spec	19 Nov 2007 03:44:09 -0000	1.43
+++ Inventor.spec	10 Jan 2008 17:46:35 -0000	1.44
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2004, 2005, 2006, 2007 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006, 2007, 2008 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:        30%{?dist}.1
+Release:        31%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -15,34 +15,25 @@
 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-30.diff.bz2
+Patch1:		Inventor-2.1.5-30-31.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # BZ: 245192
 # ExcludeArch:	ppc64
 
-%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
-%else
+%if "%{?_with_openmotif}"
 BuildRequires:	openmotif-devel
+%else
+BuildRequires:	lesstif-devel
 %endif
 BuildRequires:	freetype-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	bison
-# Workaround to RH shipping bison with broken package dependencies
-BuildRequires:	m4
 BuildRequires:	/bin/csh
 
 # fonts
@@ -97,11 +88,7 @@
 Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-%if "%{?fedora}" >= "5"
 Requires:	%{_bindir}/xmessage
-%else
-Requires:	/usr/X11R6/bin/xmessage
-%endif
 
 %description    -n InventorXt
 SGI Open Inventor (TM) development files.
@@ -113,10 +100,10 @@
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
-%if "%{?fedora}" >= "6"
-Requires:	lesstif-devel
-%else
+%if "%{?_with_openmotif}"
 Requires:	openmotif-devel
+%else
+Requires:	lesstif-devel
 %endif
 
 %description    -n InventorXt-devel
@@ -151,6 +138,7 @@
 %setup -q -n inventor
 find -name CVS | xargs rm -rf
 %patch0 -p0
+%patch1 -p0
 
 sed -i \
 -e 's,^IVPREFIX =.*$,IVPREFIX = %{_prefix},' \
@@ -350,6 +338,11 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Thu Jan 10 2008 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-31
+- Spec file cleanup.
+- Introduce --with openmotif.
+- Add Inventor-2.1.5-30-31.diff.
+
 * Mon Nov 19 2007 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-30.1
 - Add hard-coded deps on font files (BZ 388761).
 - Switch to using liberation-fonts instead of dejavu-fonts.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Inventor/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	19 Nov 2007 03:44:09 -0000	1.8
+++ sources	10 Jan 2008 17:46:35 -0000	1.9
@@ -1,2 +1,3 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
 bc7650c1bf5c57fed469f92cbe9dc2c8  Inventor-2.1.5-30.diff.bz2
+2ee259ac89a5ff3ec1f55a3c3db8cd31  Inventor-2.1.5-30-31.diff