rpms/OpenSceneGraph/devel OpenSceneGraph-1.0.diff, 1.1, 1.2 OpenSceneGraph.spec, 1.14, 1.15
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Wed Jun 7 04:30:11 UTC 2006
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11552
Modified Files:
OpenSceneGraph-1.0.diff OpenSceneGraph.spec
Log Message:
* Tue Jun 07 2006 Ralf Corsépius <rc040203 at freenet.de> - 1.0-4
- Try to avoid adding SONAMEs on plugins and applications.
OpenSceneGraph-1.0.diff:
Index: OpenSceneGraph-1.0.diff
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph-1.0.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OpenSceneGraph-1.0.diff 6 Jun 2006 05:44:43 -0000 1.1
+++ OpenSceneGraph-1.0.diff 7 Jun 2006 04:30:11 -0000 1.2
@@ -1,6 +1,6 @@
-diff -uNr OSG_OP_OT-1.0.orig/debian/Doxyfile-openscenegraph OSG_OP_OT-1.0/debian/Doxyfile-openscenegraph
+diff -uNr OSG_OP_OT-1.0.orig/debian/Doxyfile-openscenegraph OSG_OP_OT-1.0.hacked/debian/Doxyfile-openscenegraph
--- OSG_OP_OT-1.0.orig/debian/Doxyfile-openscenegraph 1970-01-01 01:00:00.000000000 +0100
-+++ OSG_OP_OT-1.0/debian/Doxyfile-openscenegraph 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/debian/Doxyfile-openscenegraph 2006-06-07 00:06:00.000000000 +0200
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
@@ -207,9 +207,9 @@
+# Configuration::addtions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
-diff -uNr OSG_OP_OT-1.0.orig/debian/Doxyfile-openthreads OSG_OP_OT-1.0/debian/Doxyfile-openthreads
+diff -uNr OSG_OP_OT-1.0.orig/debian/Doxyfile-openthreads OSG_OP_OT-1.0.hacked/debian/Doxyfile-openthreads
--- OSG_OP_OT-1.0.orig/debian/Doxyfile-openthreads 1970-01-01 01:00:00.000000000 +0100
-+++ OSG_OP_OT-1.0/debian/Doxyfile-openthreads 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/debian/Doxyfile-openthreads 2006-06-07 00:06:00.000000000 +0200
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
@@ -416,9 +416,9 @@
+# Configuration::addtions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
-diff -uNr OSG_OP_OT-1.0.orig/debian/Doxyfile-producer OSG_OP_OT-1.0/debian/Doxyfile-producer
+diff -uNr OSG_OP_OT-1.0.orig/debian/Doxyfile-producer OSG_OP_OT-1.0.hacked/debian/Doxyfile-producer
--- OSG_OP_OT-1.0.orig/debian/Doxyfile-producer 1970-01-01 01:00:00.000000000 +0100
-+++ OSG_OP_OT-1.0/debian/Doxyfile-producer 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/debian/Doxyfile-producer 2006-06-07 00:06:00.000000000 +0200
@@ -0,0 +1,205 @@
+# Doxyfile 1.3.4
+
@@ -625,9 +625,9 @@
+# Configuration::addtions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
-diff -uNr OSG_OP_OT-1.0.orig/debian/osgexamples.1 OSG_OP_OT-1.0/debian/osgexamples.1
+diff -uNr OSG_OP_OT-1.0.orig/debian/osgexamples.1 OSG_OP_OT-1.0.hacked/debian/osgexamples.1
--- OSG_OP_OT-1.0.orig/debian/osgexamples.1 1970-01-01 01:00:00.000000000 +0100
-+++ OSG_OP_OT-1.0/debian/osgexamples.1 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/debian/osgexamples.1 2006-06-07 00:06:00.000000000 +0200
@@ -0,0 +1,28 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
@@ -657,9 +657,9 @@
+.SH AUTHOR
+This manual page was written by Loic Dachary <loic at gnu.org>
+for the Debian project (but may be used by others).
-diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/include/osg/Shader OSG_OP_OT-1.0/OpenSceneGraph/include/osg/Shader
+diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/include/osg/Shader OSG_OP_OT-1.0.hacked/OpenSceneGraph/include/osg/Shader
--- OSG_OP_OT-1.0.orig/OpenSceneGraph/include/osg/Shader 2005-06-20 12:36:06.000000000 +0200
-+++ OSG_OP_OT-1.0/OpenSceneGraph/include/osg/Shader 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/OpenSceneGraph/include/osg/Shader 2006-06-07 00:06:00.000000000 +0200
@@ -39,6 +39,8 @@
* configuration.
*/
@@ -669,9 +669,9 @@
class OSG_EXPORT Shader : public osg::Object
{
public:
-diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/Make/instexamplesrc OSG_OP_OT-1.0/OpenSceneGraph/Make/instexamplesrc
+diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/Make/instexamplesrc OSG_OP_OT-1.0.hacked/OpenSceneGraph/Make/instexamplesrc
--- OSG_OP_OT-1.0.orig/OpenSceneGraph/Make/instexamplesrc 2003-07-19 19:55:18.000000000 +0200
-+++ OSG_OP_OT-1.0/OpenSceneGraph/Make/instexamplesrc 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/OpenSceneGraph/Make/instexamplesrc 2006-06-07 00:06:00.000000000 +0200
@@ -32,7 +32,7 @@
cd $TOPDIR/examples/$d
[ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
@@ -681,21 +681,35 @@
do
src=`echo $f | cut -f1 -d"="`
dst=`echo $f | cut -f2 -d"="`
-diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/Make/makedefs OSG_OP_OT-1.0/OpenSceneGraph/Make/makedefs
+diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/Make/libdefs OSG_OP_OT-1.0.hacked/OpenSceneGraph/Make/libdefs
+--- OSG_OP_OT-1.0.orig/OpenSceneGraph/Make/libdefs 1970-01-01 01:00:00.000000000 +0100
++++ OSG_OP_OT-1.0.hacked/OpenSceneGraph/Make/libdefs 2006-06-07 00:07:44.000000000 +0200
+@@ -0,0 +1,4 @@
++ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
++ LDFLAGS += -Wl,-soname -Wl,$@.$(VERSION_MAJOR)
++endif
++
+diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/Make/makedefs OSG_OP_OT-1.0.hacked/OpenSceneGraph/Make/makedefs
--- OSG_OP_OT-1.0.orig/OpenSceneGraph/Make/makedefs 2005-12-09 23:53:32.000000000 +0100
-+++ OSG_OP_OT-1.0/OpenSceneGraph/Make/makedefs 2006-06-04 06:00:50.000000000 +0200
-@@ -354,7 +354,7 @@
++++ OSG_OP_OT-1.0.hacked/OpenSceneGraph/Make/makedefs 2006-06-07 00:07:56.000000000 +0200
+@@ -352,14 +352,6 @@
+ ARCHINST =
+ endif
else
-
- ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+-
+-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
- LDFLAGS += -Wl,-soname -Wl,$@.0
-+ LDFLAGS += -Wl,-soname -Wl,$@.$(VERSION_MAJOR)
- endif
-
- # LDFLAGS += `getconf LFS_LDFLAGS`
-diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile OSG_OP_OT-1.0/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile
+-endif
+-
+-# LDFLAGS += `getconf LFS_LDFLAGS`
+-# DEF += `getconf LFS_CFLAGS`
+-
+ LIBS = -lstdc++
+ DEF += -W -Wall -fPIC -pipe
+ OPTF = -O2
+diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile OSG_OP_OT-1.0.hacked/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile
--- OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile 2003-03-12 11:39:36.000000000 +0100
-+++ OSG_OP_OT-1.0/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/OpenSceneGraph/src/osgPlugins/gif/GNUmakefile 2006-06-07 00:06:00.000000000 +0200
@@ -5,15 +5,7 @@
ReaderWriterGIF.cpp\
@@ -712,9 +726,9 @@
LIBS += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS)
-diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/png/GNUmakefile OSG_OP_OT-1.0/OpenSceneGraph/src/osgPlugins/png/GNUmakefile
+diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/png/GNUmakefile OSG_OP_OT-1.0.hacked/OpenSceneGraph/src/osgPlugins/png/GNUmakefile
--- OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/png/GNUmakefile 2003-03-12 11:39:38.000000000 +0100
-+++ OSG_OP_OT-1.0/OpenSceneGraph/src/osgPlugins/png/GNUmakefile 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/OpenSceneGraph/src/osgPlugins/png/GNUmakefile 2006-06-07 00:06:00.000000000 +0200
@@ -5,14 +5,7 @@
ReaderWriterPNG.cpp\
@@ -730,9 +744,9 @@
TARGET_BASENAME = png
include $(TOPDIR)/Make/cygwin_plugin_def
-diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile OSG_OP_OT-1.0/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile
+diff -uNr OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile OSG_OP_OT-1.0.hacked/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile
--- OSG_OP_OT-1.0.orig/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile 2003-03-12 11:39:39.000000000 +0100
-+++ OSG_OP_OT-1.0/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/OpenSceneGraph/src/osgPlugins/tiff/GNUmakefile 2006-06-07 00:06:00.000000000 +0200
@@ -6,12 +6,7 @@
LIBS += $(OSG_LIBS) $(TIFF_LIB) $(OTHER_LIBS)
@@ -746,21 +760,32 @@
TARGET_BASENAME = tiff
include $(TOPDIR)/Make/cygwin_plugin_def
-diff -uNr OSG_OP_OT-1.0.orig/OpenThreads/Make/makedefs OSG_OP_OT-1.0/OpenThreads/Make/makedefs
+diff -uNr OSG_OP_OT-1.0.orig/OpenThreads/Make/libdefs OSG_OP_OT-1.0.hacked/OpenThreads/Make/libdefs
+--- OSG_OP_OT-1.0.orig/OpenThreads/Make/libdefs 1970-01-01 01:00:00.000000000 +0100
++++ OSG_OP_OT-1.0.hacked/OpenThreads/Make/libdefs 2006-06-07 00:08:23.000000000 +0200
+@@ -0,0 +1,3 @@
++ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
++ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
++endif
+diff -uNr OSG_OP_OT-1.0.orig/OpenThreads/Make/makedefs OSG_OP_OT-1.0.hacked/OpenThreads/Make/makedefs
--- OSG_OP_OT-1.0.orig/OpenThreads/Make/makedefs 2005-12-09 23:49:24.000000000 +0100
-+++ OSG_OP_OT-1.0/OpenThreads/Make/makedefs 2006-06-04 06:01:16.000000000 +0200
-@@ -228,7 +228,7 @@
++++ OSG_OP_OT-1.0.hacked/OpenThreads/Make/makedefs 2006-06-07 00:08:27.000000000 +0200
+@@ -226,12 +226,6 @@
+ ifeq (x$(CXX),x)
+ CXX = g++
endif
-
- ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+-
+-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
- LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
- endif
-
- ###DEF += -fPIC
-diff -uNr OSG_OP_OT-1.0.orig/OpenThreads/pthread_src/PThread.c++ OSG_OP_OT-1.0/OpenThreads/pthread_src/PThread.c++
+-endif
+-
+- ###DEF += -fPIC
+ OPTF = -O2
+ DBGF = -ggdb -gstabs
+ ifeq ($(SYSARCH),x86_64)
+diff -uNr OSG_OP_OT-1.0.orig/OpenThreads/pthread_src/PThread.c++ OSG_OP_OT-1.0.hacked/OpenThreads/pthread_src/PThread.c++
--- OSG_OP_OT-1.0.orig/OpenThreads/pthread_src/PThread.c++ 2005-05-20 23:11:42.000000000 +0200
-+++ OSG_OP_OT-1.0/OpenThreads/pthread_src/PThread.c++ 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/OpenThreads/pthread_src/PThread.c++ 2006-06-07 00:06:00.000000000 +0200
@@ -529,27 +529,18 @@
PThreadPrivateData *pd = static_cast<PThreadPrivateData *> (_prvData);
@@ -790,9 +815,9 @@
pd->stackSize = defaultStackSize;
-diff -uNr OSG_OP_OT-1.0.orig/OpenThreads/pthread_src/PThreadPrivateData.h OSG_OP_OT-1.0/OpenThreads/pthread_src/PThreadPrivateData.h
+diff -uNr OSG_OP_OT-1.0.orig/OpenThreads/pthread_src/PThreadPrivateData.h OSG_OP_OT-1.0.hacked/OpenThreads/pthread_src/PThreadPrivateData.h
--- OSG_OP_OT-1.0.orig/OpenThreads/pthread_src/PThreadPrivateData.h 2004-08-27 18:45:14.000000000 +0200
-+++ OSG_OP_OT-1.0/OpenThreads/pthread_src/PThreadPrivateData.h 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/OpenThreads/pthread_src/PThreadPrivateData.h 2006-06-07 00:06:00.000000000 +0200
@@ -43,7 +43,7 @@
private:
@@ -802,9 +827,9 @@
virtual ~PThreadPrivateData() {};
-diff -uNr OSG_OP_OT-1.0.orig/Producer/include/Producer/Keyboard OSG_OP_OT-1.0/Producer/include/Producer/Keyboard
+diff -uNr OSG_OP_OT-1.0.orig/Producer/include/Producer/Keyboard OSG_OP_OT-1.0.hacked/Producer/include/Producer/Keyboard
--- OSG_OP_OT-1.0.orig/Producer/include/Producer/Keyboard 2005-10-28 22:53:43.000000000 +0200
-+++ OSG_OP_OT-1.0/Producer/include/Producer/Keyboard 2006-06-04 05:56:54.000000000 +0200
++++ OSG_OP_OT-1.0.hacked/Producer/include/Producer/Keyboard 2006-06-07 00:06:00.000000000 +0200
@@ -539,6 +539,7 @@
KeyboardKey _key;
};
@@ -813,15 +838,26 @@
class PR_EXPORT Keyboard : public Producer::Referenced
{
-diff -uNr OSG_OP_OT-1.0.orig/Producer/Make/makedefs OSG_OP_OT-1.0/Producer/Make/makedefs
+diff -uNr OSG_OP_OT-1.0.orig/Producer/Make/libdefs OSG_OP_OT-1.0.hacked/Producer/Make/libdefs
+--- OSG_OP_OT-1.0.orig/Producer/Make/libdefs 1970-01-01 01:00:00.000000000 +0100
++++ OSG_OP_OT-1.0.hacked/Producer/Make/libdefs 2006-06-07 00:08:58.000000000 +0200
+@@ -0,0 +1,4 @@
++ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
++ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
++endif
++
+diff -uNr OSG_OP_OT-1.0.orig/Producer/Make/makedefs OSG_OP_OT-1.0.hacked/Producer/Make/makedefs
--- OSG_OP_OT-1.0.orig/Producer/Make/makedefs 2005-12-09 23:51:33.000000000 +0100
-+++ OSG_OP_OT-1.0/Producer/Make/makedefs 2006-06-04 06:01:02.000000000 +0200
-@@ -250,7 +250,7 @@
++++ OSG_OP_OT-1.0.hacked/Producer/Make/makedefs 2006-06-07 00:09:01.000000000 +0200
+@@ -248,11 +248,6 @@
+ ifeq (x$(CXX),x)
+ CXX = g++
endif
-
- ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+-
+-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
- LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).0
-+ LDFLAGS += -Wl,-soname -Wl,$@.$(LIB_EXT).$(VERSION_MAJOR)
- endif
-
+-endif
+-
DEF += -fPIC -pthread
+ OPTF = -O2
+ DBGF = -ggdb -gstabs
Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- OpenSceneGraph.spec 6 Jun 2006 14:55:33 -0000 1.14
+++ OpenSceneGraph.spec 7 Jun 2006 04:30:11 -0000 1.15
@@ -91,16 +91,9 @@
-e 's,then\\,then \\,g' \
$dir/Make/*rules
-cat << \EOF > $dir/Make/libdefs
-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
- LDFLAGS += -Wl,-soname -Wl,$@.$(VERSION_MAJOR)
-endif
-EOF
-
find $dir -name GNUmakefile -exec grep -l 'LIB[ ]*=' {} \; | \
xargs sed -i \
- -e 's,\(^include.*makedefs\)[ ]*$,\1\ninclude \$(TOPDIR)/Make/libdefs,' \
- -e 's,\(^LIB[ ]*=.*TARGET_BASENAME)\)[ ]*$,\1.\$(LIB_EXT),'
+ -e 's,\(^include.*makedefs\)[ ]*$,\1\ninclude \$(TOPDIR)/Make/libdefs,'
# Fix libdir
sed -i \
@@ -398,7 +391,7 @@
%{_includedir}/Producer
%changelog
-* Tue Jun 06 2006 Ralf Corsépius <rc040203 at freenet.de> - 1.0-4
+* Tue Jun 07 2006 Ralf Corsépius <rc040203 at freenet.de> - 1.0-4
- Try to avoid adding SONAMEs on plugins and applications.
* Tue Jun 06 2006 Ralf Corsépius <rc040203 at freenet.de> - 1.0-3
More information about the fedora-extras-commits
mailing list