rpms/OpenSceneGraph/devel OpenSceneGraph-0.9.9-revdeb.diff,1.2,1.3
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Sun Aug 28 05:49:52 UTC 2005
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7553
Modified Files:
OpenSceneGraph-0.9.9-revdeb.diff
Log Message:
Revert Debian /usr/X11R6/lib changes.
OpenSceneGraph-0.9.9-revdeb.diff:
Index: OpenSceneGraph-0.9.9-revdeb.diff
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph-0.9.9-revdeb.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenSceneGraph-0.9.9-revdeb.diff 28 Aug 2005 05:02:33 -0000 1.2
+++ OpenSceneGraph-0.9.9-revdeb.diff 28 Aug 2005 05:49:50 -0000 1.3
@@ -63,7 +63,7 @@
HTML_FOOTER =
diff -uNr OSG_OP_OT-0.9.9.debian/OpenSceneGraph/Make/makedefs OSG_OP_OT-0.9.9.revdeb/OpenSceneGraph/Make/makedefs
--- OSG_OP_OT-0.9.9.debian/OpenSceneGraph/Make/makedefs 2005-08-27 07:36:37.000000000 +0200
-+++ OSG_OP_OT-0.9.9.revdeb/OpenSceneGraph/Make/makedefs 2005-08-27 07:38:12.000000000 +0200
++++ OSG_OP_OT-0.9.9.revdeb/OpenSceneGraph/Make/makedefs 2005-08-28 07:45:07.000000000 +0200
@@ -350,7 +350,7 @@
else
@@ -73,9 +73,27 @@
endif
# LDFLAGS += `getconf LFS_LDFLAGS`
+@@ -364,7 +364,7 @@
+ ifeq ($(SYSARCH),x86_64)
+ ARCHARGS =
+ ARCH = 64
+- ARCHINST =
++ ARCHINST = 64
+ else
+ ARCHARGS =
+ ARCH = 32
+@@ -374,7 +374,7 @@
+
+ SHARED = -shared
+ ifeq ($(SYSARCH),x86_64)
+- LINKARGS = -L/usr/X11R6/lib
++ LINKARGS = -L/usr/X11R6/lib64
+ else
+ LINKARGS = -L/usr/X11R6/lib
+ endif
diff -uNr OSG_OP_OT-0.9.9.debian/OpenThreads/Make/makedefs OSG_OP_OT-0.9.9.revdeb/OpenThreads/Make/makedefs
--- OSG_OP_OT-0.9.9.debian/OpenThreads/Make/makedefs 2005-08-27 07:36:37.000000000 +0200
-+++ OSG_OP_OT-0.9.9.revdeb/OpenThreads/Make/makedefs 2005-08-27 07:38:12.000000000 +0200
++++ OSG_OP_OT-0.9.9.revdeb/OpenThreads/Make/makedefs 2005-08-28 07:45:07.000000000 +0200
@@ -226,7 +226,7 @@
endif
@@ -85,9 +103,18 @@
endif
###DEF += -fPIC
+@@ -249,7 +249,7 @@
+ SHARED = -shared
+ ARCHARGS =
+ ifeq ($(SYSARCH),x86_64)
+- LINKARGS = -L/usr/X11R6/lib
++ LINKARGS = -L/usr/X11R6/lib64
+ else
+ LINKARGS = -L/usr/X11R6/lib
+ endif
diff -uNr OSG_OP_OT-0.9.9.debian/Producer/Make/makedefs OSG_OP_OT-0.9.9.revdeb/Producer/Make/makedefs
--- OSG_OP_OT-0.9.9.debian/Producer/Make/makedefs 2005-08-27 07:36:37.000000000 +0200
-+++ OSG_OP_OT-0.9.9.revdeb/Producer/Make/makedefs 2005-08-27 07:38:12.000000000 +0200
++++ OSG_OP_OT-0.9.9.revdeb/Producer/Make/makedefs 2005-08-28 07:45:07.000000000 +0200
@@ -249,7 +249,7 @@
endif
@@ -97,6 +124,15 @@
endif
DEF += -fPIC -pthread
+@@ -271,7 +271,7 @@
+ SHARED = -shared
+ ARCHARGS =
+ ifeq ($(SYSARCH),x86_64)
+- LINKARGS = -L/usr/X11R6/lib
++ LINKARGS = -L/usr/X11R6/lib64
+ else
+ LINKARGS = -L/usr/X11R6/lib
+ endif
diff -uNr OSG_OP_OT-0.9.9.debian/Producer/Make/producer.pc OSG_OP_OT-0.9.9.revdeb/Producer/Make/producer.pc
--- OSG_OP_OT-0.9.9.debian/Producer/Make/producer.pc 2005-08-27 07:36:37.000000000 +0200
+++ OSG_OP_OT-0.9.9.revdeb/Producer/Make/producer.pc 2005-08-27 07:38:59.000000000 +0200
@@ -105,8 +141,8 @@
Description: cross-platform C++ library for managing OpenGL rendering contexts
Version: 0.9.9
-Requires: openscenegraph
-+Requires: openthreads
-+Provides: openproducer
++Requires: producer
++Provides: OpenProducer
Conflicts:
Libs: -L${libdir} -lProducer
Cflags: -I${includedir}
More information about the fedora-extras-commits
mailing list