diff --git a/.cvsignore b/.cvsignore
index 225f4eb..7ea199d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-games-2.2.0.tar.bz2
+gnome-games-2.4.0.tar.bz2
diff --git a/gnome-games.spec b/gnome-games.spec
index 622d310..4f4d608 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -3,19 +3,18 @@
%define glib2_version 2.2.0
%define pango_version 1.2.0
%define gtk2_version 2.2.0
-%define libgnomeui_version 2.2.0
+%define libgnomeui_version 2.3.0
%define desktop_file_utils_version 0.2.90
Summary: GNOME games.
Name: gnome-games
-Version: 2.2.0
+Version: 2.4.0
Release: 3
Epoch: 1
Copyright: LGPL
Group: Amusements/Games
Source: ftp://ftp.gnome.org/pub/GNOME/sources/pre-gnome2/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gnome-games-2.2.0-applyschemas.patch
-Patch1: gnome-games-2.2.0-gnomestonescrash.patch
+Patch0: gnome-games-2.4.0-gtali-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Obsoletes: gnome gnome-games-devel
URL: http://www.gnome.org
@@ -40,8 +39,7 @@ The games are mostly puzzle or solitaire games.
%prep
%setup -q
-%patch0 -p1 -b .applyschemas
-%patch1 -p1 -b .stonescrash
+%patch0 -p1 -b .nocrash
%build
@@ -82,11 +80,16 @@ desktop-file-install --vendor gnome --delete-original \
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-only-show-in GNOME \
- $RPM_BUILD_ROOT%{_datadir}/applications/gnome-sol.desktop \
- $RPM_BUILD_ROOT%{_datadir}/applications/gnome-freecell.desktop \
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-glines.desktop \
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnect.desktop
+
+desktop-file-install --vendor gnome --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-only-show-in GNOME \
+ $RPM_BUILD_ROOT%{_datadir}/applications/gnome-freecell.desktop \
+ $RPM_BUILD_ROOT%{_datadir}/applications/gnome-sol.desktop
+
perl -pi -e 's@@[Joe,Jim,James]@g' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
%find_lang %{gettext_package}
@@ -99,7 +102,7 @@ rm -rf $RPM_BUILD_ROOT
scrollkeeper-update
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnect.schemas gnomine.schemas same-gnome.schemas mahjongg.schemas gtali.schemas gataxx.schemas iagno.schemas freecell.schemas"
+SCHEMAS="aisleriot.schemas gataxx.schemas gnect.schemas gnobots2.schemas gnometris.schemas gnotravex.schemas iagno.schemas same-gnome.schemas blackjack.schemas glines.schemas gnibbles.schemas gnome-stones.schemas gnomine.schemas gtali.schemas mahjongg.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
done
@@ -124,6 +127,7 @@ scrollkeeper-update
%{_datadir}/gnome-stonesrc*
%{_datadir}/gnibbles
%{_datadir}/sol-games
+%{_datadir}/blackjack
%{_datadir}/omf
%{_libdir}/gnome-stones
%{_libdir}/*.so.*
@@ -133,6 +137,8 @@ scrollkeeper-update
# these are not setgid games
%{_bindir}/gnect
+%{_bindir}/blackjack
+%{_bindir}/sol
# these are setgid games
%attr(2551, root, games) %{_bindir}/gnomine
@@ -147,11 +153,6 @@ scrollkeeper-update
%attr(2551, root, games) %{_bindir}/gnibbles
%attr(2551, root, games) %{_bindir}/glines
%attr(2551, root, games) %{_bindir}/iagno
-%attr(2551, root, games) %{_bindir}/freecell
-%attr(2551, root, games) %{_bindir}/sol
-
-# these are not setgid
-%{_bindir}/ctali
# would be a devel package if it was worth it (nothing links to this anyhow)
%{_includedir}/gdkcardimage
@@ -159,6 +160,27 @@ scrollkeeper-update
%changelog
+* Tue Oct 21 2003 Jeremy Katz 1:2.4.0-3
+- add patch so that gtali doesn't crash (#106524)
+
+* Fri Oct 3 2003 Alexander Larsson 1:2.4.0-2
+- 2.4.0
+
+* Mon Aug 25 2003 Alexander Larsson 1:2.3.8-1
+- update for gnome 2.3
+- don't build aisleriot on ia64 due to some strange guile lib issue
+
+* Mon Jul 28 2003 Havoc Pennington 1:2.2.1-2
+- rebuild
+
+* Mon Jul 7 2003 Havoc Pennington 1:2.2.1-1
+- 2.2.1
+- remove "applyschemas" patch fixed upstream
+- remove "stonescrash" patch also fixed upstream
+
+* Wed Jun 04 2003 Elliot Lee
+- rebuilt
+
* Mon Feb 24 2003 Elliot Lee
- debuginfo rebuild
diff --git a/sources b/sources
index 589ae1a..12fc389 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6bcb214c267faa51cfa002b607d87164 gnome-games-2.2.0.tar.bz2
+a1a2935642921e7defce3a0a5c54bdbd gnome-games-2.4.0.tar.bz2