[gnome-games/f18] Get rid of the -compat subpackages
Kalev Lember
kalev at fedoraproject.org
Tue Oct 16 18:19:48 UTC 2012
commit 8c0733a43f3b1d2a0d20c8931672694f3f70ded7
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sat Oct 13 13:22:34 2012 +0200
Get rid of the -compat subpackages
This reworks the way the package split is handled on upgrades. Instead
of using compat subpackages for pulling in the deps, we can let yum
handle the package split with obsoletes.
gnome-games.spec | 93 ++++++++++++++++++++++++------------------------------
1 files changed, 41 insertions(+), 52 deletions(-)
---
diff --git a/gnome-games.spec b/gnome-games.spec
index d98954f..cc9fc2f 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -23,6 +23,9 @@
%define sudoku %{nil}
%endif
+%define gnome_games_split_version 1:3.5.5-3
+%define gnome_games_compat_removed_version 1:3.6.0.2-2
+
%define glib2_version 2.32.0
%define pango_version 1.29.0
%define desktop_file_utils_version 0.2.90
@@ -31,7 +34,7 @@
Summary: Games for the GNOME desktop
Name: gnome-games
Version: 3.6.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GPLv3 and GFDL
#VCS: git:git://git.gnome.org/gnome-games
@@ -85,6 +88,9 @@ individually.
%package gnomine
Summary: GNOME Mines Sweeper game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games < %{gnome_games_split_version}
+Obsoletes: gnome-games-help < %{gnome_games_split_version}
+Obsoletes: gnome-games-compat < %{gnome_games_compat_removed_version}
%description gnomine
The popular logic puzzle minesweeper. Find mines on a grid using hints from
@@ -94,6 +100,9 @@ squares you have already cleared.
%package iagno
Summary: GNOME Reversi game.
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games < %{gnome_games_split_version}
+Obsoletes: gnome-games-help < %{gnome_games_split_version}
+Obsoletes: gnome-games-compat < %{gnome_games_compat_removed_version}
%description iagno
The GNOME version of Reversi. The goal is to control the most disks on the
@@ -103,6 +112,9 @@ board.
%package swell-foop
Summary: GNOME Swell-Foop game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games < %{gnome_games_split_version}
+Obsoletes: gnome-games-help < %{gnome_games_split_version}
+Obsoletes: gnome-games-compat < %{gnome_games_compat_removed_version}
%description swell-foop
"I want to play that game! You know, they all go whirly-round and you click on
@@ -114,6 +126,9 @@ them and they vanish!" - Telsa.
Summary: GNOME Sudoku game.
BuildArch: noarch
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games < %{gnome_games_split_version}
+Obsoletes: gnome-games-help < %{gnome_games_split_version}
+Obsoletes: gnome-games-compat < %{gnome_games_compat_removed_version}
Provides: gnome-sudoku = %{epoch}:%{version}-%{release}
Obsoletes: gnome-sudoku < %{epoch}:%{version}-%{release}
@@ -125,6 +140,8 @@ A logic game with a Japanese name that has recently exploded in popularity.
%package glchess
Summary: GNOME Chess game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
Provides: glchess = %{epoch}:%{version}-%{release}
Obsoletes: glchess < 2.0
@@ -136,6 +153,8 @@ support if OpenGL is present.
%package glines
Summary: GNOME "Five or More" game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description glines
Move balls around the grid and try and form lines. Once you form five in a
@@ -145,6 +164,8 @@ row, the line disappears. Unfortunately more balls keep dropping in.
%package gnect
Summary: GNOME "Four in a row" game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description gnect
Place disks one at a time and try to form a row of four. Tic-tac-toe for those
@@ -154,6 +175,8 @@ who like to think.
%package gnibbles
Summary: GNOME Nibbles game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description gnibbles
Pilot a worm around a maze trying to collect diamonds and at the same time
@@ -164,6 +187,8 @@ navigation becomes more and more difficult. Playable by up to four people.
%package gnobots2
Summary: GNOME Robots game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description gnobots2
The classic game where you have to avoid a hoard of robots who are trying to
@@ -174,6 +199,8 @@ aren't very smart and you also have a helpful teleportation gadget.
%package mahjongg
Summary: GNOME Mahjongg game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description mahjongg
Mahjongg is a simple pattern recognition game. You score points by matching
@@ -183,6 +210,8 @@ identical tiles.
%package gnotravex
Summary: GNOME Tetravex game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description gnotravex
A puzzle game where you have to match a grid of tiles together. The skill
@@ -193,6 +222,8 @@ by six grid.
%package gnotski
Summary: GNOME Klotski game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description gnotski
A series of sliding block puzzles. Try and solve them in the least number of
@@ -203,6 +234,8 @@ moves.
%package gtali
Summary: GNOME Tali game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description gtali
Sort of poker with dice and less money. An ancient Roman game.
@@ -212,6 +245,8 @@ Sort of poker with dice and less money. An ancient Roman game.
%package lightsoff
Summary: GNOME Lightsoff game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description lightsoff
A puzzle played on an 5X5 grid with the aim to turn off all the lights. Each
@@ -222,57 +257,13 @@ neighbors.
%package quadrapassel
Summary: GNOME falling blocks game
Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-games-extra < %{gnome_games_split_version}
+Obsoletes: gnome-games-extra-compat < %{gnome_games_compat_removed_version}
%description quadrapassel
The Russian game of falling geometric shapes.
-%package compat
-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} < 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 = %{epoch}:%{version}-%{release}
-%endif
-
-%description compat
-This package only exists to help transition gnome-games users to the new
-package split. It will be removed after one distribution release cycle, please
-do not reference it or depend on it in any way.
-
-
-%package extra-compat
-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 < 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 = %{epoch}:%{version}-%{release}
-%endif
-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
-package split. It will be removed after one distribution release cycle, please
-do not reference it or depend on it in any way.
-
-
%prep
%setup -q
@@ -717,13 +708,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/glib-2.0/schemas/org.gnome.quadrapassel.gschema.xml
%{_datadir}/help/*/quadrapassel
-%files compat
-%doc AUTHORS COPYING README
-
-%files extra-compat
-%doc AUTHORS COPYING README
%changelog
+* Sat Oct 13 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.6.0.2-2
+- Improvements to the way the package split is handled on upgrades
+
* Wed Sep 26 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.6.0.2-1
- Update to 3.6.0.2
More information about the scm-commits
mailing list