rpms/Inventor/FC-5 .cvsignore, 1.2, 1.3 Inventor.spec, 1.31, 1.32 sources, 1.2, 1.3 inventor_2.1.5-10-2.diff, 1.1, NONE

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	.cvsignore Inventor.spec sources 
Removed Files:
	inventor_2.1.5-10-2.diff 
Log Message:
* Thu Sep 25 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-22
- Misc minor fixes.
- Add dep to xmessage.
- Use unified patch.
- Rebuild against lesscrap.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 03:59:15 -0000	1.2
+++ .cvsignore	28 Sep 2006 09:00:00 -0000	1.3
@@ -1 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
+Inventor-2.1.5-22.diff


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/Inventor.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Inventor.spec	19 Feb 2006 10:09:28 -0000	1.31
+++ Inventor.spec	28 Sep 2006 09:00:00 -0000	1.32
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        20%{?dist}
+Release:        22%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,24 +14,7 @@
 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
-# Debian patch
-Patch0:         inventor_2.1.5-10-2.diff
-# fix broken GNUmakefiles
-Patch1:		Inventor-apps.diff
-# fixes one of the GNUmakefile bugs (currently unused)
-Patch2:		Inventor-libSoXt.diff
-# use bison
-Patch3:		Inventor-yacc.diff
-# use /bin/csh (Revert debian patch)
-Patch4:		Inventor-makeManDirs.diff
-# Add libdl to libInventor
-Patch5:		Inventor-libInventor.diff
-# Add libgl to Decal.so
-Patch6:		Inventor-decal.diff
-# Add pkgconfig support
-Patch7:		Inventor-pkgconfig.diff
-# Declare SoTempPath forward
-Patch8:		Inventor-SoPath.diff
+Patch0:		Inventor-2.1.5-22.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,7 +23,11 @@
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
 
+%if "%{?fedora}" >= "6"
+BuildRequires:	lesstif-devel
+%else
 BuildRequires:	openmotif-devel
+%endif
 BuildRequires:	freetype-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	bison
@@ -70,22 +57,30 @@
 SGI Open Inventor (TM) development files.
 
 %package        -n InventorXt
-Summary:        SGI Open Inventor (TM) Motif bindings.
+Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	pkgconfig
+%if "%{?fedora}" >= "4"
+Requires:	%{_bindir}/xmessage
+%else
+Requires:	/usr/X11R6/bin/xmessage
+%endif
 
 %description    -n InventorXt
 SGI Open Inventor (TM) development files.
 
 %package        -n InventorXt-devel
-Summary:        SGI Open Inventor (TM) Motif bindings.
+Summary:        SGI Open Inventor (TM) Motif bindings
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
+%if "%{?fedora}" >= "6"
+Requires:	lesstif-devel
+%else
 Requires:	openmotif-devel
+%endif
 
 %description    -n InventorXt-devel
 SGI Open Inventor (TM) development files.
@@ -107,7 +102,7 @@
 
 %package	examples
 Summary:	SGI Open Inventor (TM) source code examples
-Group:		Development/Demos
+Group:		Development/Libraries
 # Should we once ship binary examples, this requirement can be dropped
 Requires:	InventorXt-devel
 
@@ -117,15 +112,8 @@
 
 %prep
 %setup -q -n inventor
-%patch0 -p1 -b .debian
-%patch1 -p0
-# %patch2 -p0 -b .orig
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
+find -name CVS | xargs rm -rf
+%patch0 -p0
 
 grep -Rl __ia64 lib* | while read a; do \
   sed -i -e 's,__ia64,__ia64__,g' \
@@ -174,7 +162,7 @@
 rm -rf $RPM_BUILD_ROOT
 export LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir}
 export VCOPTS="${RPM_OPT_FLAGS} -D_REENTRANT"
-export VCXXOPTS="${RPM_OPT_FLAGS} -D_REENTRANT"
+export VCXXOPTS="${RPM_OPT_FLAGS} -D_REENTRANT -D__STDC_FORMAT_MACROS"
 make all \
   FREETYPE=1 IVROOT=${RPM_BUILD_ROOT} \
   LSUBDIRS="libimage tools libFL"
@@ -190,8 +178,6 @@
 cp -a apps/examples devel-docs
 cp -a make devel-docs
 pushd devel-docs > /dev/null
-find -name CVS | xargs rm -rf
-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 -i -e "s,^IVDEPTH = .*$,IVDEPTH = $b," $a
@@ -298,6 +284,15 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* Thu Sep 25 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-22
+- Misc minor fixes.
+- Add dep to xmessage.
+- Use unified patch.
+- Rebuild against lesscrap.
+
+* Tue Sep 05 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-21
+- Mass rebuild.
+
 * Sun Feb 19 2006 Ralf Corsépius <rc040203 at freenet.de> - 2.1.5-20
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 03:59:15 -0000	1.2
+++ sources	28 Sep 2006 09:00:00 -0000	1.3
@@ -1 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
+6fa640c31471056a882c536a41040a71  Inventor-2.1.5-22.diff


--- inventor_2.1.5-10-2.diff DELETED ---