rpms/OpenSceneGraph/devel .cvsignore, 1.1, 1.2 OpenSceneGraph.spec, 1.5, 1.6 sources, 1.1, 1.2 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1, NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1, NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
Ralf Corsépius (corsepiu)
fedora-extras-commits at redhat.com
Wed Dec 7 02:50:40 UTC 2005
- Previous message (by thread): rpms/OpenSceneGraph/FC-3 .cvsignore, 1.1, 1.2 OpenSceneGraph.spec, 1.5, 1.6 sources, 1.1, 1.2 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1, NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1, NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
- Next message (by thread): rpms/irssi/devel .cvsignore, 1.3, 1.4 irssi.spec, 1.10, 1.11 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: corsepiu
Update of /cvs/extras/rpms/OpenSceneGraph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2656
Modified Files:
.cvsignore OpenSceneGraph.spec sources
Removed Files:
OpenSceneGraph-0.9.9-osgPlugins.diff
OpenSceneGraph-0.9.9-osgTerrain.diff
OpenSceneGraph-0.9.9-revdeb.diff
Log Message:
- Merge diffs into one file.
- Fix up *.pcs from inside of *.spec.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 28 Aug 2005 05:06:09 -0000 1.1
+++ .cvsignore 7 Dec 2005 02:50:38 -0000 1.2
@@ -1,2 +1,2 @@
-openscenegraph_0.9.9-5.diff.gz
OSG_OP_OT-0.9.9.zip
+OpenSceneGraph-0.9.9.diff
Index: OpenSceneGraph.spec
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/OpenSceneGraph.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OpenSceneGraph.spec 28 Aug 2005 07:27:18 -0000 1.5
+++ OpenSceneGraph.spec 7 Dec 2005 02:50:38 -0000 1.6
@@ -4,9 +4,11 @@
# package are under the same license as the package itself.
#
+%define apivers 0.9.9
+
Name: OpenSceneGraph
Version: 0.9.9
-Release: 4%{?dist}
+Release: 4%{?dist}.1
Summary: High performance real-time graphics toolkit
Group: Applications/Multimedia
@@ -14,14 +16,7 @@
URL: http://www.openscenegraph.org/
Source0: http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-%{version}.zip
-# Debian patch
-Patch0: http://ftp.debian.org/debian/pool/main/o/openscenegraph/openscenegraph_0.9.9-5.diff.gz
-
-# Revert parts of the Debian patch
-Patch1: OpenSceneGraph-0.9.9-revdeb.diff
-
-Patch2: OpenSceneGraph-0.9.9-osgTerrain.diff
-Patch3: OpenSceneGraph-0.9.9-osgPlugins.diff
+Patch0: OpenSceneGraph-0.9.9.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,9 +45,6 @@
%prep
%setup -q -n OSG_OP_OT-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# backup, we hack this file later
cp OpenSceneGraph/Make/dependencies \
@@ -85,7 +77,12 @@
$dir/Make/makerules
# Fix libdir
- sed -i -e 's,^libdir=.*$,libdir = %{_libdir},' \
+ sed -i \
+ -e 's,^prefix=.*$,prefix = %{_prefix},' \
+ -e 's,^includedir=.*$,includedir = %{_includedir},' \
+ -e 's,^libdir=.*$,libdir = %{_libdir},' \
+ -e 's,^Version:.*$,Version: %{apivers},' \
+ -e '/^Conflicts:$/d' \
$dir/Make/$(echo $dir | tr [:upper:] [:lower:]).pc
done
@@ -366,6 +363,10 @@
%{_includedir}/Producer
%changelog
+* 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.
+
* Sun Aug 28 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.9.9-4
- Propagate %%_libdir to pkgconfig files.
- Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/OpenSceneGraph/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 28 Aug 2005 04:38:17 -0000 1.1
+++ sources 7 Dec 2005 02:50:38 -0000 1.2
@@ -1,2 +1,2 @@
-4aed300dd024609687e8f2e8348409e7 openscenegraph_0.9.9-5.diff.gz
711773db3874320967091327473dbc31 OSG_OP_OT-0.9.9.zip
+b1d2366ab6db7c8102153bd262a4a145 OpenSceneGraph-0.9.9.diff
--- OpenSceneGraph-0.9.9-osgPlugins.diff DELETED ---
--- OpenSceneGraph-0.9.9-osgTerrain.diff DELETED ---
--- OpenSceneGraph-0.9.9-revdeb.diff DELETED ---
- Previous message (by thread): rpms/OpenSceneGraph/FC-3 .cvsignore, 1.1, 1.2 OpenSceneGraph.spec, 1.5, 1.6 sources, 1.1, 1.2 OpenSceneGraph-0.9.9-osgPlugins.diff, 1.1, NONE OpenSceneGraph-0.9.9-osgTerrain.diff, 1.1, NONE OpenSceneGraph-0.9.9-revdeb.diff, 1.3, NONE
- Next message (by thread): rpms/irssi/devel .cvsignore, 1.3, 1.4 irssi.spec, 1.10, 1.11 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list