rpms/OpenSceneGraph/FC-4 .cvsignore, 1.2, 1.3 OpenSceneGraph.spec, 1.7, 1.8 sources, 1.2, 1.3

[Ralf Corsépius (corsepiu)]

Author: corsepiu

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

Modified Files:
	.cvsignore OpenSceneGraph.spec sources 
Log Message:
* Tue Jun 07 2006 Ralf Corsépius <rc040203 at freenet.de> - 0.9.9-5
- Add SONAME hack to spec (PR 193934).
- Try to avoid adding SONAMEs on plugins and applications.
- Regenerate OpenSceneGraph-0.9.9.diff.
- Remove OpenSceneGraph-0.9.9.diff from look-aside cache. Add to CVS instead.
- Fix broken shell fragments.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 02:42:21 -0000	1.2
+++ .cvsignore	7 Jun 2006 07:51:21 -0000	1.3
@@ -1,2 +1 @@
 OSG_OP_OT-0.9.9.zip
-OpenSceneGraph-0.9.9.diff


Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/OpenSceneGraph.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OpenSceneGraph.spec	7 Dec 2005 13:16:02 -0000	1.7
+++ OpenSceneGraph.spec	7 Jun 2006 07:51:21 -0000	1.8
@@ -1,22 +1,23 @@
 #
-# Copyright (c) 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 
 %define apivers 0.9.9
+%define srcvers 0.9.9
 
 Name:           OpenSceneGraph
 Version:        0.9.9
-Release:        4%{?dist}.1
+Release:        5%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 Group:          Applications/Multimedia
 License:        OSGPL
 URL:            http://www.openscenegraph.org/
-Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
+Source0:        http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{srcvers}.zip
 
-Patch0:		OpenSceneGraph-0.9.9.diff
+Patch0:		OpenSceneGraph-%{srcvers}.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -43,7 +44,7 @@
 for rapid development of graphics applications.
 
 %prep
-%setup -q -n OSG_OP_OT-%{version}
+%setup -q -n OSG_OP_OT-%{srcvers}
 %patch0 -p1
 
 # backup, we hack this file later
@@ -66,6 +67,8 @@
     -e 's,^\(INST_LIBS[ ]*=\).*$,\1 $(DESTDIR)%{_libdir},g' \
     -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
@@ -76,6 +79,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},' \
@@ -139,7 +155,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
@@ -354,6 +381,13 @@
 %{_includedir}/Producer
 
 %changelog
+* Tue Jun 07 2006 Ralf Corsépius <rc040203 at freenet.de> - 0.9.9-5
+- Add SONAME hack to spec (PR 193934).
+- Try to avoid adding SONAMEs on plugins and applications.
+- Regenerate OpenSceneGraph-0.9.9.diff.
+- Remove OpenSceneGraph-0.9.9.diff from look-aside cache. Add to CVS instead.
+- Fix broken shell fragments.
+
 * Tue Dec 06 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.9.9-4%{?dist}.1
 - Merge diffs into one file.
 - Fix up *.pcs from inside of *.spec.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 02:42:21 -0000	1.2
+++ sources	7 Jun 2006 07:51:21 -0000	1.3
@@ -1,2 +1 @@
 711773db3874320967091327473dbc31  OSG_OP_OT-0.9.9.zip
-b1d2366ab6db7c8102153bd262a4a145  OpenSceneGraph-0.9.9.diff