[stage: 1/2] Update to release 4.1.1 Cleanup old patches
rmattes
rmattes at fedoraproject.org
Tue Jan 17 02:35:51 UTC 2012
commit fab406ddbaf380ade2c6543534fded1b5864c6b1
Author: Rich Mattes <richmattes at gmail.com>
Date: Mon Jan 16 21:34:39 2012 -0500
Update to release 4.1.1
Cleanup old patches
.gitignore | 1 +
Stage-4.0.1.fixbuild.patch | 14 -----
Stage-4.0.1.fixregion.patch | 39 -------------
sources | 2 +-
stage-3.2.2.fixcmake64.patch | 119 -----------------------------------------
stage-3.2.2.fixdso.patch | 15 -----
stage-3.2.2.fixexamples.patch | 16 ------
stage-3.2.2.fixlibload.patch | 43 ---------------
stage.spec | 36 +++++++------
9 files changed, 22 insertions(+), 263 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0234c31..62f7754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
Stage-3.2.2-Source.tar.gz
/Stage-4.0.0-src.tar.gz
/Stage-0e7f6a.tar.bz2
+/rtv-Stage-v4.1.1-0-g13e03ee.tar.gz
diff --git a/sources b/sources
index 657a77f..828c820 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a21059085a9a2864dd3b89cc081c63ed Stage-0e7f6a.tar.bz2
+195df538027803136b06ed57107b576a rtv-Stage-v4.1.1-0-g13e03ee.tar.gz
diff --git a/stage.spec b/stage.spec
index 550c9d3..8c4f9b7 100644
--- a/stage.spec
+++ b/stage.spec
@@ -1,21 +1,24 @@
Name: stage
-Version: 4.0.1
-Release: 1.0e7f6agit%{?dist}
+Version: 4.1.1
+Release: 1%{?dist}
Summary: A 2.5D multi-robot simulator
Group: Applications/Engineering
License: GPLv2+
URL: http://playerstage.sourceforge.net
-# Git snapshot generated with generate_tarball.sh using following command:
+# Source acquired from github tag snapshot:
+# https://github.com/rtv/Stage/tarball/v4.1.1
+Source0: rtv-Stage-v4.1.1-0-g13e03ee.tar.gz
+# Git snapshot can be generated with generate_tarball.sh using following command:
# ./generate_tarball.sh 0e7f6a
-Source0: Stage-0e7f6a.tar.bz2
Source1: generate_tarball.sh
+# This patch installs the Player plugin to libdir/player instead of libdir
Patch0: Stage-4.0.0.plugininstall.patch
+# This patch fixes a typo for libdir selection in the CMake buildsystem
Patch1: Stage-4.0.0.s390x-typos.patch
-Patch2: Stage-4.0.1.fixregion.patch
-Patch3: Stage-4.0.1.fixbuild.patch
-Patch4: Stage-4.0.1.stageplugin.patch
-Patch5: Stage-4.0.1.multiline.patch
+# This patch allows libstageplugin's graphics2d interface to be compatible
+# with Player versions earlier than 3.1
+Patch2: Stage-4.0.1.multiline.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,13 +68,11 @@ stage-playerplugin allows Stage models to be exposed as Player interfaces,
and manipulated through the Player server.
%prep
-%setup -q -n Stage
+%setup -q -n rtv-Stage-c318423
%patch0 -p0
%patch1 -p1 -b .s390x-typos
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p1
+%patch2 -p1
+sed -i 's/PLAYER_CAPABILITIES_REQ/PLAYER_CAPABILTIES_REQ/' libstageplugin/p_simulation.cc
%build
%cmake .
@@ -93,7 +94,6 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/stage/worlds/*.sh
# These config files are broken, remove them
rm $RPM_BUILD_ROOT%{_datadir}/stage/worlds/uoa*
rm $RPM_BUILD_ROOT%{_datadir}/stage/worlds/large.world
-rm $RPM_BUILD_ROOT%{_datadir}/stage/worlds/asr.*
rm -rf $RPM_BUILD_ROOT%{_datadir}/stage/worlds/wifi*
%clean
@@ -109,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/stage
%{_libdir}/*.so.*
%{_datadir}/stage
-%{_libdir}/Stage-4.0
+%{_libdir}/Stage-4.1
%files playerplugin
%defattr(-,root,root,-)
@@ -120,10 +120,14 @@ rm -rf $RPM_BUILD_ROOT
%doc docsrc/html
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
-%{_includedir}/Stage-4.0
+%{_includedir}/Stage-4.1
%changelog
+* Mon Jan 16 2012 Rich Mattes <richmattes at gmail.com> - 4.1.1-1
+- Update to release 4.1.1
+- Cleanup old patches
+
* Sun May 29 2011 Rich Mattes <richmattes at gmail.com> - 4.0.1-1.0e7f6agit
- Latest git snapshot
More information about the scm-commits
mailing list