- Update to 2.34.2

1 files changed, 23 insertions, 30 deletions

diff --git a/metacity.spec b/metacity.spec
index 15a4058..129540b 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -2,19 +2,16 @@
 
 Summary: Unobtrusive window manager
 Name: metacity
-Version: 2.34.1
-Release: 3%{?dist}
+Version: 2.34.2
+Release: 1%{?dist}
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.34/metacity-%{version}.tar.xz
 # http://bugzilla.gnome.org/show_bug.cgi?id=558723
 Patch4: stop-spamming-xsession-errors.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=135056
 Patch5: dnd-keynav.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=336750
-Patch10: screenshot-forkbomb.patch
 
 # fedora specific patches
-Patch11: workspaces.patch
 Patch12: fresh-tooltips.patch
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=598995
@@ -36,9 +33,6 @@ Patch28: Stop-confusing-GDK-s-grab-tracking.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=622517
 Patch29: Allow-breaking-out-from-maximization-during-mouse.patch
 
-# default window icon: https://bugzilla.gnome.org/show_bug.cgi?id=616246
-Patch30: default-window-icon.patch
-
 Source1: window.png
 Source2: mini-window.png
 
@@ -47,7 +41,7 @@ Group: User Interface/Desktops
 BuildRequires: gtk2-devel 
 BuildRequires: pango-devel 
 BuildRequires: fontconfig-devel
-BuildRequires: GConf2-devel 
+BuildRequires: gsettings-desktop-schemas-devel
 BuildRequires: desktop-file-utils
 BuildRequires: libglade2-devel 
 BuildRequires: autoconf, automake, libtool, gnome-common
@@ -69,14 +63,8 @@ BuildRequires: libcanberra-devel
 Requires: startup-notification 
 # for /usr/share/control-center/keybindings, /usr/share/gnome/wm-properties
 Requires: control-center-filesystem
-# for /etc/gconf/schemas
-Requires: GConf2
 Requires: zenity
 
-Requires(post): GConf2
-Requires(pre): GConf2 
-Requires(preun): GConf2
-
 # http://bugzilla.redhat.com/605675
 Provides: firstboot(windowmanager) = metacity
 
@@ -100,8 +88,6 @@ API. This package exists purely for technical reasons.
 %setup -q
 %patch4 -p1 -b .stop-spamming-xsession-errors
 %patch5 -p1 -b .dnd-keynav
-%patch10 -p1 -b .screenshot-forkbomb
-%patch11 -p1 -b .workspaces
 %patch12 -p1 -b .fresh-tooltips
 
 %patch16 -p1 -b .focus-different-workspace
@@ -115,12 +101,10 @@ API. This package exists purely for technical reasons.
 %patch28 -p1 -b .grab-tracking
 %patch29 -p1 -b .mouse-unmaximize
 
-%patch30 -p1 -b .window-icon
-
 cp -p %{SOURCE1} %{SOURCE2} src/
 
 # force regeneration
-rm -f src/metacity.schemas
+rm -f src/org.gnome.metacity.gschema.valid
 
 %build
 CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
@@ -129,7 +113,7 @@ export CPPFLAGS
 # Always rerun configure for now
 rm -f configure
 (if ! test -x configure; then autoreconf -i -f; fi;
- %configure --disable-static)
+ %configure --disable-static --disable-schemas-compile)
 
 SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_XFREE_XINERAMA HAVE_SHAPE HAVE_RANDR HAVE_STARTUP_NOTIFICATION"
 
@@ -147,9 +131,7 @@ done
 make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags}
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
@@ -162,22 +144,22 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post
 /sbin/ldconfig
-%gconf_schema_upgrade metacity
 
-%pre
-%gconf_schema_prepare metacity
-
-%preun
-%gconf_schema_remove metacity
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %postun -p /sbin/ldconfig
+if [ $1 -eq 0 ]; then
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS HACKING doc/theme-format.txt doc/metacity-theme.dtd rationales.txt
 %{_bindir}/metacity
 %{_bindir}/metacity-message
-%{_sysconfdir}/gconf/schemas/*.schemas
+%{_datadir}/glib-2.0/schemas/*
+%{_datadir}/GConf/gsettings/metacity-schemas.convert
 %{_datadir}/metacity
 %{_datadir}/themes/*
 %{_datadir}/gnome-control-center/keybindings/*
@@ -199,6 +181,17 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_mandir}/man1/metacity-window-demo.1.gz
 
 %changelog
+* Thu Feb 09 2012 Florian Müllner <fmuellner@redhat.com> 2.34.2-1
+- Update to 2.34.2
+- Remove patches:
+  - screenshot-forkbomb.patch: screenshot keybindings have been moved
+    to gnome-settings-daemon
+  - workspace.patch: default preference values now defined in
+    gsettings-desktop-schemas
+  - default-window-icon.patch: included upstream
+- Rebase remaining patches
+- Adjust spec file to dropped GConf dependency
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.34.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild