rpms/OpenSceneGraph/FC-5 .cvsignore, 1.3, 1.4 OpenSceneGraph.spec, 1.11, 1.12 sources, 1.3, 1.4

[Ralf Corsépius (corsepiu)]

Author: corsepiu

Update of /cvs/extras/rpms/OpenSceneGraph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11695

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
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.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2005 15:07:53 -0000	1.3
+++ .cvsignore	7 Jun 2006 04:56:16 -0000	1.4
@@ -1,2 +1 @@
 OSG_OP_OT-1.0.zip
-OpenSceneGraph-1.0.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/OpenSceneGraph.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- OpenSceneGraph.spec	19 Feb 2006 10:03:12 -0000	1.11
+++ OpenSceneGraph.spec	7 Jun 2006 04:56:16 -0000	1.12
@@ -9,7 +9,7 @@
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        2%{?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
@@ -81,6 +82,19 @@
     -e 's, DOF=$(OPTF) , "DOF=$(OPTF)" ,g' \
     $dir/Make/makerules
 
+# Fix broken shell fragments
+  sed -i \
+    -e 's,do\\,do \\,g' \
+    -e 's,else\\,else \\,g' \
+    -e 's,fi\\,fi;\\,g' \
+    -e 's,done\\,done;\\,g' \
+    -e 's,then\\,then \\,g' \
+    $dir/Make/*rules
+
+  find $dir -name GNUmakefile -exec grep -l '^[ ]*LIB[ ]*=' {} \; | \
+    xargs sed -i \
+      -e 's,\(^include.*makedefs\)[ ]*$,\1\ninclude \$(TOPDIR)/Make/libdefs,'
+
 # Fix libdir
   sed -i \
     -e 's,^prefix=.*$,prefix = %{_prefix},' \
@@ -144,7 +158,18 @@
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSceneGraph/src
 
+# HACK ALERT: This should be fixed inside of the makefiles.
 # fix up shared library symlinks
+pushd ${RPM_BUILD_ROOT}%{_libdir} > /dev/null
+  for i in lib*.so; do
+    if test -f $i; then
+      rm -f $i.*
+      soname=$(objdump -p $i | grep SONAME | sed 's,[ ]*SONAME[ ]*,,')
+      mv $i $soname
+      ln -s $soname $i
+    fi
+  done
+popd > /dev/null
 /sbin/ldconfig -n ${RPM_BUILD_ROOT}%{_libdir}
 
 install -m 644 -D OpenThreads/Make/openthreads.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/openthreads.pc
@@ -366,6 +391,15 @@
 %{_includedir}/Producer
 
 %changelog
+* 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
+- Add SONAME hack to spec (PR 193934).
+- Regenerate OpenSceneGraph-1.0.diff.
+- Remove OpenSceneGraph-1.0.diff from look-aside cache. Add to CVS instead.
+- Fix broken shell fragments.
+
 * Sun Feb 19 2006 Ralf Corsépius <rc040203 at freenet.de> - 1.0-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Dec 2005 15:07:53 -0000	1.3
+++ sources	7 Jun 2006 04:56:16 -0000	1.4
@@ -1,2 +1 @@
 dfb3eca46b32625602dabe9aa46c6b6f  OSG_OP_OT-1.0.zip
-c8dfb2766674965a367d5c3777c9738b  OpenSceneGraph-1.0.diff