rpms/Inventor/FC-4 .cvsignore, 1.2, 1.3 Inventor.spec, 1.14, 1.15 sources, 1.2, 1.3

Mon Oct 2 04:54:10 UTC 2006

Author: corsepiu

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/.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	2 Oct 2006 04:54:10 -0000	1.3
@@ -1 +1,2 @@
 inventor-2.1.5-10.src.tar.gz
+Inventor-2.1.5-23.diff.bz2


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/Inventor.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Inventor.spec	3 Aug 2005 04:06:39 -0000	1.14
+++ Inventor.spec	2 Oct 2006 04:54:10 -0000	1.15
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006 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:        13%{?dist}
+Release:        23%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -14,31 +14,30 @@
 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-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
-BuildRequires:	openmotif-devel freetype-devel libjpeg-devel
+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
+BuildRequires:	openmotif-devel
+%endif
+BuildRequires:	freetype-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	bison
 # Workaround to RH shipping bison with broken package dependencies
 BuildRequires:	m4
@@ -59,29 +58,37 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	pkgconfig
-Requires:	xorg-x11-devel
+Requires:	libGLU-devel
 Requires:	freetype-devel libjpeg-devel
 
 %description    devel
 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.
@@ -103,7 +110,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
 
@@ -113,15 +120,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' \
@@ -165,12 +165,14 @@
     < $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
 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"
@@ -179,15 +181,13 @@
   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
 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
@@ -294,6 +294,45 @@
 %{_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.
+- 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.
+
+* Fri Dec 30 2005 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.1.5-19
+- Don't BR: libXau-devel (#176313 reported to be fixed).
+
+* Wed Dec 28 2005 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.1.5-18
+- Remove patch10 (#173879, #175251 are reported to be fixed).
+
+* Thu Dec 22 2005 Ralf CorsÃ©pius <rc040203 at freenet.de> - 2.1.5-17
+- Remove BR: libX11-devel (#173712 reported to be fixed).
+- Remove BR: libGL-devel (#175253 reported to be fixed).
+
+* Wed Dec 14 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-16
+- Remove BR: libXext-devel (Impl. R'd by openmotif-devel).
+- Remove BR: xorg-x11-proto-devel (PR #175256).
+
+* Thu Dec 8 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-15
+- Further modular X fixes.
+- Reflect modular X pkgconfigs.
+
+* Thu Dec 8 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.1.5-14
+- Attempt to build against modular X.
+- Add Inventor-redhat-bugs patch.
+
 * Tue Aug 03 2005 Ralf Corsepius <ralf[AT]links2linux.de> - 2.1.5-13
 - Let PPC use standard RPM_OPT_FLAGS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Inventor/FC-4/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	2 Oct 2006 04:54:10 -0000	1.3
@@ -1 +1,2 @@
 82208096f1e0b111160e864e239c3a51  inventor-2.1.5-10.src.tar.gz
+c8e1cbcc3ae9f51f97940b06d522bd47  Inventor-2.1.5-23.diff.bz2


