[gnome-games] Remove last traces of GConf handling
Kalev Lember
kalev at fedoraproject.org
Mon Mar 26 14:32:18 UTC 2012
commit 7bf213424182e1c8df17ba9b01bf8412479a8ce0
Author: Kalev Lember <kalevlember at gmail.com>
Date: Fri Mar 23 13:13:19 2012 +0200
Remove last traces of GConf handling
Fixes errors during gnome-games-extra package install:
I/O warning : failed to load external entity "/etc/gconf/schemas/gtali.schemas"
Failed to open `/etc/gconf/schemas/gtali.schemas': No such file or directory
I/O warning : failed to load external entity "/etc/gconf/schemas/gnect.schemas"
Failed to open `/etc/gconf/schemas/gnect.schemas': No such file or directory
I/O warning : failed to load external entity "/etc/gconf/schemas/gnibbles.schemas"
Failed to open `/etc/gconf/schemas/gnibbles.schemas': No such file or directory
I/O warning : failed to load external entity "/etc/gconf/schemas/gnobots2.schemas"
Failed to open `/etc/gconf/schemas/gnobots2.schemas': No such file or directory
I/O warning : failed to load external entity "/etc/gconf/schemas/gnotski.schemas"
Failed to open `/etc/gconf/schemas/gnotski.schemas': No such file or directory
I/O warning : failed to load external entity "/etc/gconf/schemas/quadrapassel.schemas"
Failed to open `/etc/gconf/schemas/quadrapassel.schemas': No such file or directory
gnome-games.spec | 30 ++++--------------------------
1 files changed, 4 insertions(+), 26 deletions(-)
---
diff --git a/gnome-games.spec b/gnome-games.spec
index 028237c..da67a83 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -31,7 +31,7 @@
Summary: Games for the GNOME desktop
Name: gnome-games
Version: 3.3.92
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GPLv3 and GFDL
Group: Amusements/Games
@@ -43,13 +43,7 @@ Patch0: gnome-games-gl.patch
Obsoletes: gnome-games-devel < %{epoch}:%{version}-%{release}
URL: http://projects.gnome.org/gnome-games/
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-
-Requires: GConf2
Requires: pygobject2
-Requires: gnome-python2-gconf
Requires: hicolor-icon-theme
Requires: gobject-introspection
@@ -80,7 +74,6 @@ BuildRequires: mesa-libGLU-devel
BuildRequires: libICE-devel
BuildRequires: libSM-devel
# for autoreconf
-BuildRequires: GConf2-devel
BuildRequires: itstool
BuildRequires: yelp-tools
@@ -132,12 +125,9 @@ This package contains user documentation for %{name}.
make %{?_smp_mflags}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
## things we just don't want in the package
-
rm -rf $RPM_BUILD_ROOT%{_libdir}/libgdkcardimage.*a
rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
@@ -153,10 +143,6 @@ desktop-file-install --vendor gnome --delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-glines.desktop \
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnect.desktop
-%if %{build_tali}
-perl -pi -e 's@<default></default>@<default>[Joe,Jim,James]</default>@g' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
-%endif
-
rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-games/libgames-support-gi.{l,}a
%find_lang %{gettext_package} --all-name --with-gnome
@@ -171,19 +157,8 @@ grep -v "/sr at latin/figures" help-tmp.lang > help.lang
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%post extra
-%gconf_schema_upgrade %{gtali} gnect gnibbles gnobots2 gnotski quadrapassel
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%pre
-%gconf_schema_obsolete gnomine iagno same-gnome %{sudoku} %{swell_foop}
-
-%pre extra
-%gconf_schema_prepare %{gtali} gnect gnibbles gnobots2 gnotski %{lightsoff} quadrapassel
-%gconf_schema_obsolete blackjack glchess gnometris mahjongg
-
-%preun extra
-%gconf_schema_remove %{gtali} gnect gnibbles gnobots2 gnotski %{lightsoff} quadrapassel
-
%postun
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
@@ -391,6 +366,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%{_datadir}/help/*/lightsoff
%changelog
+* Mon Mar 26 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.3.92-3
+- Remove last traces of GConf handling
+
* Sat Mar 24 2012 Matthias Clasen <mclasen at redhat.com> - 1:3.3.92-2
- Simplify spec file, seed games were rewritten in vala
More information about the scm-commits
mailing list