[gnome-games/f18: 3/5] Specify the Epoch for Requires/Obsoletes
Mathieu Bridon
bochecha at fedoraproject.org
Fri Aug 10 17:16:57 UTC 2012
commit ec9a7b3c0aee16b47dd500890a2c3de8f8dcbcee
Author: Mathieu Bridon <bochecha at fedoraproject.org>
Date: Sat Aug 11 01:13:28 2012 +0800
Specify the Epoch for Requires/Obsoletes
Not having it in the previous commit was breaking the
upgrade path.
gnome-games.spec | 69 ++++++++++++++++++++++++++++-------------------------
1 files changed, 36 insertions(+), 33 deletions(-)
---
diff --git a/gnome-games.spec b/gnome-games.spec
index 26a8b78..312e26d 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -87,7 +87,7 @@ individually.
%package gnomine
Summary: GNOME Mines Sweeper game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description gnomine
The popular logic puzzle minesweeper. Find mines on a grid using hints from
@@ -96,7 +96,7 @@ squares you have already cleared.
%package iagno
Summary: GNOME Reversi game.
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description iagno
The GNOME version of Reversi. The goal is to control the most disks on the
@@ -105,7 +105,7 @@ board.
%package swell-foop
Summary: GNOME Swell-Foop game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description swell-foop
"I want to play that game! You know, they all go whirly-round and you click on
@@ -116,7 +116,7 @@ them and they vanish!" - Telsa.
%package sudoku
Summary: GNOME Sudoku game.
BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: gnome-sudoku = %{epoch}:%{version}-%{release}
Obsoletes: gnome-sudoku < %{epoch}:%{version}-%{release}
@@ -127,7 +127,7 @@ A logic game with a Japanese name that has recently exploded in popularity.
%package glchess
Summary: GNOME Chess game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: glchess = %{epoch}:%{version}-%{release}
Obsoletes: glchess < 2.0
@@ -138,7 +138,7 @@ support if OpenGL is present.
%package glines
Summary: GNOME "Five or More" game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description glines
Move balls around the grid and try and form lines. Once you form five in a
@@ -147,7 +147,7 @@ row, the line disappears. Unfortunately more balls keep dropping in.
%package gnect
Summary: GNOME "Four in a row" game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description gnect
Place disks one at a time and try to form a row of four. Tic-tac-toe for those
@@ -156,7 +156,7 @@ who like to think.
%package gnibbles
Summary: GNOME Nibbles game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description gnibbles
Pilot a worm around a maze trying to collect diamonds and at the same time
@@ -166,7 +166,7 @@ navigation becomes more and more difficult. Playable by up to four people.
%package gnobots2
Summary: GNOME Robots game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description gnobots2
The classic game where you have to avoid a hoard of robots who are trying to
@@ -176,7 +176,7 @@ aren't very smart and you also have a helpful teleportation gadget.
%package mahjongg
Summary: GNOME Mahjongg game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description mahjongg
Mahjongg is a simple pattern recognition game. You score points by matching
@@ -185,7 +185,7 @@ identical tiles.
%package gnotravex
Summary: GNOME Tetravex game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description gnotravex
A puzzle game where you have to match a grid of tiles together. The skill
@@ -195,7 +195,7 @@ by six grid.
%package gnotski
Summary: GNOME Klotski game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description gnotski
A series of sliding block puzzles. Try and solve them in the least number of
@@ -205,7 +205,7 @@ moves.
%if %{build_tali}
%package gtali
Summary: GNOME Tali game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description gtali
Sort of poker with dice and less money. An ancient Roman game.
@@ -214,7 +214,7 @@ Sort of poker with dice and less money. An ancient Roman game.
%package lightsoff
Summary: GNOME Lightsoff game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description lightsoff
A puzzle played on an 5X5 grid with the aim to turn off all the lights. Each
@@ -224,7 +224,7 @@ neighbors.
%package quadrapassel
Summary: GNOME falling blocks game
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description quadrapassel
The Russian game of falling geometric shapes.
@@ -235,13 +235,13 @@ Summary: Compat package to help migrate to the new "one game per package" split
BuildArch: noarch
# These help the transition (only require the gamnes which were in gnome-games)
-Obsoletes: %{name} < 3.5.5-2
-Obsoletes: %{name}-help < 3.5.5-2
-Requires: %{name}-gnomine = %{version}-%{release}
-Requires: %{name}-iagno = %{version}-%{release}
-Requires: %{name}-swell-foop = %{version}-%{release}
+Obsoletes: %{name} < 1:3.5.5-3
+Obsoletes: %{name}-help < 1:3.5.5-3
+Requires: %{name}-gnomine = %{epoch}:%{version}-%{release}
+Requires: %{name}-iagno = %{epoch}:%{version}-%{release}
+Requires: %{name}-swell-foop = %{epoch}:%{version}-%{release}
%if %{have_sudoku}
-Requires: %{name}-sudoku = %{version}-%{release}
+Requires: %{name}-sudoku = %{epoch}:%{version}-%{release}
%endif
%description compat
@@ -255,20 +255,20 @@ Summary: Compat package to help migrate to the new "one game per package" split
BuildArch: noarch
# These help the transition (only require the gamnes which were in gnome-games)
-Obsoletes: %{name}-extra < 3.5.5-2
-Requires: %{name}-glchess = %{version}-%{release}
-Requires: %{name}-glines = %{version}-%{release}
-Requires: %{name}-gnect = %{version}-%{release}
-Requires: %{name}-gnibbles = %{version}-%{release}
-Requires: %{name}-gnobots2 = %{version}-%{release}
-Requires: %{name}-gnotravex = %{version}-%{release}
-Requires: %{name}-gnotski = %{version}-%{release}
+Obsoletes: %{name}-extra < 1:3.5.5-3
+Requires: %{name}-glchess = %{epoch}:%{version}-%{release}
+Requires: %{name}-glines = %{epoch}:%{version}-%{release}
+Requires: %{name}-gnect = %{epoch}:%{version}-%{release}
+Requires: %{name}-gnibbles = %{epoch}:%{version}-%{release}
+Requires: %{name}-gnobots2 = %{epoch}:%{version}-%{release}
+Requires: %{name}-gnotravex = %{epoch}:%{version}-%{release}
+Requires: %{name}-gnotski = %{epoch}:%{version}-%{release}
%if %{build_tali}
-Requires: %{name}-gtali = %{version}-%{release}
+Requires: %{name}-gtali = %{epoch}:%{version}-%{release}
%endif
-Requires: %{name}-lightsoff = %{version}-%{release}
-Requires: %{name}-mahjongg = %{version}-%{release}
-Requires: %{name}-quadrapassel = %{version}-%{release}
+Requires: %{name}-lightsoff = %{epoch}:%{version}-%{release}
+Requires: %{name}-mahjongg = %{epoch}:%{version}-%{release}
+Requires: %{name}-quadrapassel = %{epoch}:%{version}-%{release}
%description extra-compat
This package only exists to help transition gnome-games-extra users to the new
@@ -713,6 +713,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog
+- Specify the Epoch for Requires/Obsoletes. Not having it in the previous
+ commit was breaking the upgrade path.
+
* Wed Aug 08 2012 Mathieu Bridon <bochecha at fedoraproject.org> - 1:3.5.5-2
- Split each game and its help into its own subpackage.
https://bugzilla.redhat.com/show_bug.cgi?id=846274
More information about the scm-commits
mailing list