rpms/OpenSceneGraph/devel OpenSceneGraph.spec,1.13,1.14

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	OpenSceneGraph.spec 
Log Message:
* Tue Jun 06 2006 Ralf Corsépius <rc040203 at freenet.de> - 1.0-4
- Try to avoid adding SONAMEs on plugins and applications.



Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- OpenSceneGraph.spec	6 Jun 2006 07:42:45 -0000	1.13
+++ OpenSceneGraph.spec	6 Jun 2006 14:55:33 -0000	1.14
@@ -9,7 +9,7 @@
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
@@ -71,6 +71,7 @@
     -e 's,^\(INST_EXAMPLES[ ]*=\).*$,\1 $(DESTDIR)%{_bindir},g' \
     -e 's,\(^[ \t]*LIBS[ ]*=.*\) -lstdc++,\1,g' \
     -e 's, -lXi,,g' \
+    -e 's,^\([ ]*LDFLAGS.*soname.*$\),# \1,g' \
     $dir/Make/makedefs
 
 # Propagate RPM_OPT_FLAGS
@@ -87,8 +88,20 @@
     -e 's,else\\,else \\,g' \
     -e 's,fi\\,fi;\\,g' \
     -e 's,done\\,done;\\,g' \
+    -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),'
+
 # Fix libdir
   sed -i \
     -e 's,^prefix=.*$,prefix = %{_prefix},' \
@@ -385,6 +398,9 @@
 %{_includedir}/Producer
 
 %changelog
+* Tue Jun 06 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
 - Add SONAME hack to spec (PR 193934).
 - Regenerate OpenSceneGraph-1.0.diff.