rpms/Inventor/devel Inventor-pkgconfig.diff, 1.1, 1.2 Inventor.spec, 1.24, 1.25

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	Inventor-pkgconfig.diff Inventor.spec 
Log Message:
- Further modular X fixes.
- Reflect modular X pkgconfigs.


Inventor-pkgconfig.diff:

Index: Inventor-pkgconfig.diff
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor-pkgconfig.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Inventor-pkgconfig.diff	8 Nov 2004 03:59:15 -0000	1.1
+++ Inventor-pkgconfig.diff	8 Dec 2005 08:45:37 -0000	1.2
@@ -9,9 +9,9 @@
 +Name: libInventor
 +Description: SGI Open Inventor
 +Version: 2.1.5
-+Requires: freetype2
-+Libs: -L${libdir} -L/usr/X11R6/lib -lInventor -ljpeg -lGL -lX11 -lm -ldl
-+Cflags: -I${includedir} -I/usr/X11R6/include
++Requires: freetype2 x11
++Libs: -L${libdir} -lInventor -ljpeg -lGL -lX11 -lm -ldl
++Cflags: -I${includedir}
 --- /dev/null	2003-09-15 15:40:47.000000000 +0200
 +++ libInventorXt.pc.in	2004-07-07 08:37:59.000000000 +0200
 @@ -0,0 +1,11 @@
@@ -23,6 +23,6 @@
 +Name: libInventorXt
 +Description: SGI Open InventorXt
 +Version: 2.1.5
-+Requires: libInventor
-+Libs: -L${libdir} -L/usr/X11R6/lib -lInventorXt -lXm -lXt
-+Cflags: -I${includedir} -I/usr/X11R6/include
++Requires: libInventor xt
++Libs: -L${libdir} -lInventorXt -lXm
++Cflags: -I${includedir}


Index: Inventor.spec
===================================================================
RCS file: /cvs/extras/rpms/Inventor/devel/Inventor.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Inventor.spec	8 Dec 2005 05:51:47 -0000	1.24
+++ Inventor.spec	8 Dec 2005 08:45:37 -0000	1.25
@@ -6,7 +6,7 @@
 
 Name:           Inventor
 Version:        2.1.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 
 Summary:        SGI Open Inventor (TM)
 
@@ -43,7 +43,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libGL-devel
 BuildRequires:	libGLw-devel
-BuildRequires:	libX11-devel
 BuildRequires:	libXext-devel
 # Work around to RH shipping libXext without headers
 BuildRequires:  xorg-x11-proto-devel
@@ -52,7 +51,6 @@
 # FIXME: Why is libXi required?
 BuildRequires: 	libXi-devel
 
-BuildRequires: 	libXt-devel
 BuildRequires:	openmotif-devel
 BuildRequires:	freetype-devel
 BuildRequires:	libjpeg-devel
@@ -102,6 +100,8 @@
 Requires:	InventorXt = %{version}-%{release}
 Requires:	Inventor-devel = %{version}-%{release}
 Requires:	pkgconfig
+# PR 175256: Missing openmotif-devel dep
+Requires:	xorg-x11-proto-devel
 Requires:	openmotif-devel
 
 %description    -n InventorXt-devel
@@ -317,6 +317,10 @@
 %{_libdir}/Inventor/examples
 
 %changelog
+* 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.