[speed-dreams] Update to svn5799.rc2

Martin Gansser martinkg at fedoraproject.org
Sat Jun 28 22:07:31 UTC 2014


commit 7c2a4e068558fd251872a9e0c2bff0a2ddec13e8
Author: Martin Gansser <mgansser at alice.de>
Date:   Sun Jun 29 00:07:33 2014 +0200

    Update to svn5799.rc2
    
    - added epoch to allow upgrade to pre-release
    - added global svndate macro

 .gitignore        |    5 +++++
 sources           |   10 +++++-----
 speed-dreams.spec |   27 +++++++++++++++------------
 3 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ead82f8..4641676 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,8 @@
 /speed-dreams-src-more-hq-cars-and-tracks-2.1.0-trunk-r5796.tar.xz
 /speed-dreams-src-unmaintained-2.1.0-trunk-r5796.tar.xz
 /speed-dreams-src-wip-cars-and-tracks-2.1.0-trunk-r5796.tar.xz
+/speed-dreams-src-base-rc2-r5799.tar.xz
+/speed-dreams-src-hq-cars-and-tracks-rc2-r5799.tar.xz
+/speed-dreams-src-more-hq-cars-and-tracks-rc2-r5799.tar.xz
+/speed-dreams-src-unmaintained-rc2-r5799.tar.xz
+/speed-dreams-src-wip-cars-and-tracks-rc2-r5799.tar.xz
diff --git a/sources b/sources
index c3db2bb..9c7f306 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-016f113778e5a6ff288dabd0b8367667  speed-dreams-src-base-2.1.0-trunk-r5796.tar.xz
-16d643eebd5a79c311d784c2b1ec2c53  speed-dreams-src-hq-cars-and-tracks-2.1.0-trunk-r5796.tar.xz
-827bd2866fe5e68e0f264bb633ce43cb  speed-dreams-src-more-hq-cars-and-tracks-2.1.0-trunk-r5796.tar.xz
-d80cf0553f46a815c6b563c5f8d1ad22  speed-dreams-src-unmaintained-2.1.0-trunk-r5796.tar.xz
-6226726355c8f7d9b9112e8d30caff26  speed-dreams-src-wip-cars-and-tracks-2.1.0-trunk-r5796.tar.xz
+4e45e6ebf35b5afe52be4c4d24e670a7  speed-dreams-src-base-rc2-r5799.tar.xz
+09efa3454b1b0812169b5714821279e8  speed-dreams-src-hq-cars-and-tracks-rc2-r5799.tar.xz
+71f4be0d2b5589c32deb9b3686e69128  speed-dreams-src-more-hq-cars-and-tracks-rc2-r5799.tar.xz
+293ff3117d9b82d7a509bb935cdd4d4b  speed-dreams-src-unmaintained-rc2-r5799.tar.xz
+1f4f32f726ee27fce30bbcd91c611b7f  speed-dreams-src-wip-cars-and-tracks-rc2-r5799.tar.xz
diff --git a/speed-dreams.spec b/speed-dreams.spec
index 00b9253..71e8782 100644
--- a/speed-dreams.spec
+++ b/speed-dreams.spec
@@ -1,11 +1,12 @@
 # Set sf_release to 1 to use released sources on sourceforge
-%global sf_release  0
+%global sf_release  1
+%global svndate 20140627
 
 # Versions are like 2.0.0-rc1-r5796. The first part (2.0.0 in this example)
 # goes into the Version: field, the rest (rc1-r5796 here) into %%src_release.
-%global src_release trunk-r5796
+%global src_release 5799
 
-%global src_version %{version}-%{src_release}
+%global src_version rc2-r%{src_release}
 %if 0%{?sf_release}
 %global repo_url http://downloads.sourceforge.net/project/%{name}/%{version}/
 %endif
@@ -13,7 +14,8 @@
 Summary: The Open Racing Car Simulator
 Name:    speed-dreams
 Version: 2.1.0
-Release: 19.%(echo %{src_release} | tr '-' '_')%{?dist}
+Release: 0.20.%{svndate}svn%(echo %{src_release} | tr '-' '_').rc2%{?dist}
+Epoch:   1
          # Contains LGPLv2 files also published under GPLv2+
 License: GPLv2+
 Group:   Amusements/Games
@@ -33,8 +35,8 @@ Source3: %{?repo_url}%{name}-src-more-hq-cars-and-tracks-%{src_version}.tar.xz
 Source4: %{?repo_url}%{name}-src-unmaintained-%{src_version}.tar.xz
 Source5: %{name}.desktop
 
-Provides:      %{name} = %{version}-%{release}
-Requires:      %{name}-robots-base = %{version}
+Provides:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name}-robots-base = %{epoch}:%{version}
 Requires:      opengl-games-utils
 BuildRequires: cmake
 BuildRequires: chrpath
@@ -46,8 +48,6 @@ BuildRequires: freeglut-devel
 BuildRequires: FreeSOLID-devel
 BuildRequires: libGL-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libogg-devel
-BuildRequires: libvorbis-devel
 BuildRequires: libpng-devel
 BuildRequires: libXi-devel
 BuildRequires: libXmu-devel
@@ -79,7 +79,7 @@ You can also drive yourself with either a wheel, keyboard or mouse.
 Summary:       The Open Racing Car Simulator additional dirt tracks
 Group:         Amusements/Games
 BuildArch:     noarch
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} =  %{epoch}:%{version}-%{release}
 
 %description robots-base
 This package contains additional tracks for the game.
@@ -87,7 +87,7 @@ This package contains additional tracks for the game.
 %package devel
 Summary:       The Open Racing Car Simulator development files
 Group:         Amusements/Games
-Requires:      %{name}%{?_isa} = %{version}-%{release}
+Requires:      %{name}%{?_isa} =  %{epoch}:%{version}-%{release}
 
 %description devel
 This package contains the development files for the game.
@@ -101,7 +101,6 @@ This package contains the development files for the game.
 find . -name '*.c' -o -name '*.h' -o -name '*.cpp' -o -name '*.hpp' | \
     xargs chmod 644
 
-
 %build
 # http://sourceforge.net/p/speed-dreams/tickets/728 (-lexpat)
 # http://sourceforge.net/p/speed-dreams/tickets/729 (SOLIDINCLUDE)
@@ -193,6 +192,11 @@ find %{buildroot} -size 0 -delete
 
 
 %changelog
+* Sat Jun 28 2014 Martin Gansser <martinkg at fedoraproject.org> - 2.1.0-0.20.20140627svn5799.rc2
+- Update to svn5799.rc2
+- added epoch to allow upgrade to pre-release
+- added global svndate macro
+
 * Thu Jun 26 2014 Martin Gansser <martinkg at fedoraproject.org> - 2.1.0-19.trunk_r5796
 - spec file cleanup
 - rebuild for new svn version
@@ -349,7 +353,6 @@ find %{buildroot} -size 0 -delete
 - Removed unneeded definitions of BuildRoot, clean section
 - Corrected URL
 - Moved the *.desktop file to a real file as second source
-
 - Removed unneeded BuildRequires
 
 * Fri Oct 14 2011 Martin Gansser <linux4martin at gmx.de> 2.0.0-b1-r3937-2


More information about the scm-commits mailing list