summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalev Lember <kalevlember@gmail.com>2012-04-17 22:58:56 +0300
committerKalev Lember <kalevlember@gmail.com>2012-04-17 23:10:55 +0300
commite064f06bffea251e6f53dff25791a1e0fc3ae8d8 (patch)
treec69a858031079a1e67a9877cc9a8a74555706883
parentdd6dd1b7061fb127d509c9f223f90b931c44a851 (diff)
downloadmutter-e064f06bffea251e6f53dff25791a1e0fc3ae8d8.tar.gz
mutter-e064f06bffea251e6f53dff25791a1e0fc3ae8d8.tar.xz
mutter-e064f06bffea251e6f53dff25791a1e0fc3ae8d8.zip
Update to 3.4.1
Added Conflicts: gnome-shell < 3.4.1 to make sure this can't be installed with gnome-shell 3.4.0 because of an ABI change in meta_display_add_keybinding(). https://mail.gnome.org/archives/gnome-announce-list/2012-April/msg00021.html
-rw-r--r--.gitignore1
-rw-r--r--mutter.spec12
-rw-r--r--sources2
3 files changed, 12 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 97003d2..2980688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ mutter-2.31.5.tar.bz2
/mutter-3.3.90.tar.xz
/mutter-3.3.92.tar.xz
/mutter-3.4.0.tar.xz
+/mutter-3.4.1.tar.xz
diff --git a/mutter.spec b/mutter.spec
index 1a27129..72f1c33 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,12 +1,12 @@
Name: mutter
-Version: 3.4.0
+Version: 3.4.1
Release: 1%{?dist}
Summary: Window and compositing manager based on Clutter
Group: User Interface/Desktops
License: GPLv2+
#VCS: git:git://git.gnome.org/mutter
-Source0: http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz
BuildRequires: clutter-devel >= 1.7.5
BuildRequires: pango-devel
@@ -30,6 +30,10 @@ BuildRequires: gtk-doc gnome-common intltool
BuildRequires: libcanberra-devel
BuildRequires: gsettings-desktop-schemas-devel
+# Make sure this can't be installed with an old gnome-shell build because of
+# an ABI change in mutter 3.4.1 / gnome-shell 3.4.1
+Conflicts: gnome-shell < 3.4.1
+
Requires: control-center-filesystem
Requires: startup-notification
Requires: dbus-x11
@@ -127,6 +131,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%doc %{_mandir}/man1/mutter-window-demo.1.gz
%changelog
+* Wed Apr 18 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.1-1
+- Update to 3.4.1
+- Conflict with gnome-shell versions older than 3.4.1
+
* Tue Mar 27 2012 Richard Hughes <hughsient@gmail.com> - 3.4.0-1
- Update to 3.4.0
diff --git a/sources b/sources
index 2486010..6f54502 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe2cb8d59872ef87344fff1d4362e3e4 mutter-3.4.0.tar.xz
+3ca02d4ca270e8587643af405c10f57d mutter-3.4.1.tar.xz