From fa3a05801e74c74489832936e50eb20f8d7ecaf8 Mon Sep 17 00:00:00 2001 From: corsepiu Date: Jun 06 2006 14:55:33 +0000 Subject: - Try to avoid adding SONAMEs on plugins and applications. --- diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec index 1e0e55f..009a766 100644 --- a/OpenSceneGraph.spec +++ b/OpenSceneGraph.spec @@ -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 @@ for dir in OpenThreads Producer OpenSceneGraph; do -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 @@ for dir in OpenThreads Producer OpenSceneGraph; do -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 @@ Development files for Producer. %{_includedir}/Producer %changelog +* Tue Jun 06 2006 Ralf Corsépius - 1.0-4 +- Try to avoid adding SONAMEs on plugins and applications. + * Tue Jun 06 2006 Ralf Corsépius - 1.0-3 - Add SONAME hack to spec (PR 193934). - Regenerate OpenSceneGraph-1.0.diff.