[mutter] Revert "Revert annotation updates"

Florian Müllner fmuellner at fedoraproject.org
Fri Jun 27 09:37:42 UTC 2014


commit 3ab66b033d0146d78e6a792438c06267f308e4d3
Author: Florian Müllner <fmuellner at gnome.org>
Date:   Fri Jun 27 11:34:21 2014 +0200

    Revert "Revert annotation updates"
    
    We now have a new gobject-introspection build, so drop the last patch.

 0001-Revert-Update-allow-none-annotations.patch |  178 -----------------------
 mutter.spec                                     |    8 +-
 2 files changed, 4 insertions(+), 182 deletions(-)
---
diff --git a/mutter.spec b/mutter.spec
index 7111866..9723270 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -9,15 +9,13 @@ License:       GPLv2+
 URL:           http://www.gnome.org
 Source0:       http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz
 
-Patch1: 0001-Revert-Update-allow-none-annotations.patch
-
 BuildRequires: clutter-devel >= 1.19.2
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
 BuildRequires: gnome-desktop3-devel
 BuildRequires: gtk3-devel >= 3.9.11
 BuildRequires: pkgconfig
-BuildRequires: gobject-introspection-devel
+BuildRequires: gobject-introspection-devel >= 1.41.0
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
 BuildRequires: libXdamage-devel
@@ -70,7 +68,6 @@ utilities for testing Metacity/Mutter themes.
 
 %prep
 %setup -q
-%patch1 -p1 -b .revert-nullable-annotations
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -134,6 +131,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Fri Jun 27 2014 Florian Müllner <fmuellner at redhat.com> - 3.13.3-1
+- New gobject-introspection has been built, drop the last patch again
+
 * Wed Jun 25 2014 Florian Müllner <fmuellner at redhat.com> - 3.13.3-1
 - Revert annotation updates until we get a new gobject-introspection build
 


More information about the scm-commits mailing list