From f7ce7b7e8c40cecb4926a0d2e702b33554e7496d810893c6cd7ce0d4ba788a62 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 17:06:26 +0000 Subject: [PATCH] Accepting request 132775 from GNOME:Next Starting to push GNOME:Next... OBS-URL: https://build.opensuse.org/request/show/132775 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=98 --- mutter-3.4.1.tar.xz | 3 - mutter-3.5.91.tar.xz | 3 + mutter-fix-crash-when-frame-is-NULL.patch | 52 ---- mutter-never-slice-shape-mask.patch | 43 --- mutter-use-cogl-texrect-api.patch | 321 ---------------------- mutter.changes | 100 +++++++ mutter.spec | 37 +-- 7 files changed, 124 insertions(+), 435 deletions(-) delete mode 100644 mutter-3.4.1.tar.xz create mode 100644 mutter-3.5.91.tar.xz delete mode 100644 mutter-fix-crash-when-frame-is-NULL.patch delete mode 100644 mutter-never-slice-shape-mask.patch delete mode 100644 mutter-use-cogl-texrect-api.patch diff --git a/mutter-3.4.1.tar.xz b/mutter-3.4.1.tar.xz deleted file mode 100644 index e0fc710..0000000 --- a/mutter-3.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449 -size 1597536 diff --git a/mutter-3.5.91.tar.xz b/mutter-3.5.91.tar.xz new file mode 100644 index 0000000..0afd3a6 --- /dev/null +++ b/mutter-3.5.91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ceb69923e691a9a10ac34535634795f96b17b6cbdec8f38d846a46f8a73b9332 +size 1608876 diff --git a/mutter-fix-crash-when-frame-is-NULL.patch b/mutter-fix-crash-when-frame-is-NULL.patch deleted file mode 100644 index 234e1c4..0000000 --- a/mutter-fix-crash-when-frame-is-NULL.patch +++ /dev/null @@ -1,52 +0,0 @@ -From c669a3892e377daaf31a574618a4f8566bd9df61 Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" -Date: Tue, 1 May 2012 13:40:08 -0400 -Subject: [PATCH] meta_window_move_frame(): fix crash when frame is NULL - -When meta_frame_calc_borders() was made to take a NULL frame argument, -a crash was accidentally introduced into meta_window_move_frame(). - -This partially reverts 8c1b2d5. - -https://bugzilla.gnome.org/show_bug.cgi?id=675254 ---- - src/core/window.c | 22 ++++++++++++---------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/src/core/window.c b/src/core/window.c -index 08e413c..e51de1b 100644 ---- a/src/core/window.c -+++ b/src/core/window.c -@@ -5080,18 +5080,20 @@ meta_window_move_frame (MetaWindow *window, - { - int x = root_x_nw; - int y = root_y_nw; -- MetaFrameBorders borders; -- -- meta_frame_calc_borders (window->frame, &borders); - -- /* root_x_nw and root_y_nw correspond to where the top of -- * the visible frame should be. Offset by the distance between -- * the origin of the window and the origin of the enclosing -- * window decorations. -- */ -- x += window->frame->child_x - borders.invisible.left; -- y += window->frame->child_y - borders.invisible.top; -+ if (window->frame) -+ { -+ MetaFrameBorders borders; -+ meta_frame_calc_borders (window->frame, &borders); - -+ /* root_x_nw and root_y_nw correspond to where the top of -+ * the visible frame should be. Offset by the distance between -+ * the origin of the window and the origin of the enclosing -+ * window decorations. -+ */ -+ x += window->frame->child_x - borders.invisible.left; -+ y += window->frame->child_y - borders.invisible.top; -+ } - meta_window_move (window, user_op, x, y); - } - --- -1.7.10 diff --git a/mutter-never-slice-shape-mask.patch b/mutter-never-slice-shape-mask.patch deleted file mode 100644 index 3ef7226..0000000 --- a/mutter-never-slice-shape-mask.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a22859a64a60b38346ce7faabad6a9a48d7a8d9f Mon Sep 17 00:00:00 2001 -From: Robert Bragg -Date: Wed, 25 Apr 2012 00:48:19 +0000 -Subject: shaped-texture: never slice shape mask texture - -Since Cogl doesn't support multi-texturing with sliced textures and the -shape texture is combined with the texture-from-pixmap texture we need -to make sure we never construct a sliced mask texture. This patch simply -passes the COGL_TEXTURE_NO_SLICE flag to cogl_texture_from_data when -creating the shape mask texture. - -https://bugzilla.gnome.org/show_bug.cgi?id=674731 ---- -diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c -index 07bd93c..182d23b 100644 ---- a/src/compositor/meta-shaped-texture.c -+++ b/src/compositor/meta-shaped-texture.c -@@ -313,12 +313,17 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex) - } - else - #endif /* GL_TEXTURE_RECTANGLE_ARB */ -- priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height, -- COGL_TEXTURE_NONE, -- COGL_PIXEL_FORMAT_A_8, -- COGL_PIXEL_FORMAT_ANY, -- stride, -- mask_data); -+ { -+ /* Note: we don't allow slicing for this texture because we -+ * need to use it with multi-texturing which doesn't support -+ * sliced textures */ -+ priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height, -+ COGL_TEXTURE_NO_SLICING, -+ COGL_PIXEL_FORMAT_A_8, -+ COGL_PIXEL_FORMAT_ANY, -+ stride, -+ mask_data); -+ } - - g_free (mask_data); - --- -cgit v0.9.0.2 diff --git a/mutter-use-cogl-texrect-api.patch b/mutter-use-cogl-texrect-api.patch deleted file mode 100644 index 006f4cc..0000000 --- a/mutter-use-cogl-texrect-api.patch +++ /dev/null @@ -1,321 +0,0 @@ -From ed358c8f4b1200e8532dcc0b249f51752d2695eb Mon Sep 17 00:00:00 2001 -From: Neil Roberts -Date: Fri, 23 Mar 2012 18:51:25 +0000 -Subject: meta-texture-rectangle: Use Cogl's API to create a rectangle texture - -Cogl now has public experimental API to create a rectangle texture -which we can use instead of creating a foreign texture with GL. This -avoids Mutter depending on Cogl including a GL header from its public -headers which it might not do in future. - -https://bugzilla.gnome.org/show_bug.cgi?id=672711 ---- -diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c -index 182d23b..ae21945 100644 ---- a/src/compositor/meta-shaped-texture.c -+++ b/src/compositor/meta-shaped-texture.c -@@ -250,7 +250,6 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex) - int i; - int n_rects; - int stride; -- GLenum paint_gl_target; - - /* If we have no shape region and no (or an empty) overlay region, we - * don't need to create a full mask texture, so quit early. */ -@@ -293,26 +292,14 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex) - - install_overlay_path (stex, mask_data, tex_width, tex_height, stride); - -- cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target); -- --#ifdef GL_TEXTURE_RECTANGLE_ARB -- if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB) -- { -- priv->mask_texture -- = meta_texture_rectangle_new (tex_width, tex_height, -- 0, /* flags */ -- /* data format */ -- COGL_PIXEL_FORMAT_A_8, -- /* internal GL format */ -- GL_ALPHA, -- /* internal cogl format */ -- COGL_PIXEL_FORMAT_A_8, -- /* rowstride */ -- stride, -- mask_data); -- } -+ if (meta_texture_rectangle_check (paint_tex)) -+ priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height, -+ COGL_PIXEL_FORMAT_A_8, -+ COGL_PIXEL_FORMAT_A_8, -+ stride, -+ mask_data, -+ NULL /* error */); - else --#endif /* GL_TEXTURE_RECTANGLE_ARB */ - { - /* Note: we don't allow slicing for this texture because we - * need to use it with multi-texturing which doesn't support -diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c -index d699729..af6817f 100644 ---- a/src/compositor/meta-texture-rectangle.c -+++ b/src/compositor/meta-texture-rectangle.c -@@ -5,7 +5,7 @@ - * - * Authored By Neil Roberts - * -- * Copyright (C) 2011 Intel Corporation -+ * Copyright (C) 2011, 2012 Intel Corporation - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as -@@ -25,94 +25,77 @@ - - #include - --#include "meta-texture-rectangle.h" -- --#ifdef GL_TEXTURE_RECTANGLE_ARB -+#define CLUTTER_ENABLE_EXPERIMENTAL_API -+#define COGL_ENABLE_EXPERIMENTAL_API - --static void (* pf_glGetIntegerv) (GLenum pname, GLint *params); --static void (* pf_glTexImage2D) (GLenum target, GLint level, -- GLint internalFormat, -- GLsizei width, GLsizei height, -- GLint border, GLenum format, GLenum type, -- const GLvoid *pixels); --static void (* pf_glGenTextures) (GLsizei n, GLuint *textures); --static void (* pf_glDeleteTextures) (GLsizei n, const GLuint *texture); --static void (* pf_glBindTexture) (GLenum target, GLuint texture); -- --static void --rectangle_texture_destroy_cb (void *user_data) --{ -- GLuint tex = GPOINTER_TO_UINT (user_data); -- -- pf_glDeleteTextures (1, &tex); --} -- --#endif /* GL_TEXTURE_RECTANGLE_ARB */ -+#include -+#include "meta-texture-rectangle.h" - --CoglHandle -+CoglTexture * - meta_texture_rectangle_new (unsigned int width, - unsigned int height, -- CoglTextureFlags flags, - CoglPixelFormat format, -- GLenum internal_gl_format, -- GLenum internal_format, -+ CoglPixelFormat internal_format, - unsigned int rowstride, -- const guint8 *data) -+ const guint8 *data, -+ GError **error) - { -- CoglHandle cogl_tex = COGL_INVALID_HANDLE; -- --#ifdef GL_TEXTURE_RECTANGLE_ARB -- -- static CoglUserDataKey user_data_key; -- GLint old_binding; -- GLuint tex; -- -- if (pf_glGenTextures == NULL) -- { -- pf_glGetIntegerv = (void *) cogl_get_proc_address ("glGetIntegerv"); -- pf_glTexImage2D = (void *) cogl_get_proc_address ("glTexImage2D"); -- pf_glGenTextures = (void *) cogl_get_proc_address ("glGenTextures"); -- pf_glDeleteTextures = (void *) cogl_get_proc_address ("glDeleteTextures"); -- pf_glBindTexture = (void *) cogl_get_proc_address ("glBindTexture"); -- } -- -- pf_glGenTextures (1, &tex); -- pf_glGetIntegerv (GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); -- pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); -- pf_glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, -- internal_gl_format, width, height, -- 0, internal_gl_format, -- GL_UNSIGNED_BYTE, NULL); -- pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, old_binding); -+ ClutterBackend *backend = -+ clutter_get_default_backend (); -+ CoglContext *context = -+ clutter_backend_get_cogl_context (backend); -+ CoglTextureRectangle *tex_rect; -+ -+ tex_rect = cogl_texture_rectangle_new_with_size (context, -+ width, height, -+ internal_format, -+ error); -+ if (tex_rect == NULL) -+ return NULL; - -- cogl_tex = cogl_texture_new_from_foreign (tex, -- GL_TEXTURE_RECTANGLE_ARB, -- width, height, -- 0, 0, /* no waste */ -- internal_format); -- -- /* Cogl won't destroy the GL texture when a foreign texture is used -- so we need to destroy it manually. We can set a destroy -- notification callback to do this transparently */ -- cogl_object_set_user_data (cogl_tex, -- &user_data_key, -- GUINT_TO_POINTER (tex), -- rectangle_texture_destroy_cb); -- -- /* Use cogl_texture_set_region instead of uploading the data -- directly with GL calls so that we can let Cogl deal with setting -- the pixel store parameters and handling format conversion */ - if (data) -- cogl_texture_set_region (cogl_tex, -- 0, 0, /* src x/y */ -- 0, 0, /* dst x/y */ -- width, height, /* dst width/height */ -- width, height, /* src width/height */ -+ cogl_texture_set_region (COGL_TEXTURE (tex_rect), -+ 0, 0, /* src_x/y */ -+ 0, 0, /* dst_x/y */ -+ width, height, /* dst_width/height */ -+ width, height, /* width/height */ - format, - rowstride, - data); - --#endif /* GL_TEXTURE_RECTANGLE_ARB */ -+ return COGL_TEXTURE (tex_rect); -+} -+ -+static void -+texture_rectangle_check_cb (CoglTexture *sub_texture, -+ const float *sub_texture_coords, -+ const float *meta_coords, -+ void *user_data) -+{ -+ gboolean *result = user_data; -+ -+ if (cogl_is_texture_rectangle (sub_texture)) -+ *result = TRUE; -+} -+ -+/* Determines if the given texture is using a rectangle texture as its -+ * primitive texture type. Eventually this function could be replaced -+ * with cogl_texture_get_type if Cogl makes that public. -+ * -+ * http://git.gnome.org/browse/cogl/commit/?h=8012eee31 -+ */ -+gboolean -+meta_texture_rectangle_check (CoglTexture *texture) -+{ -+ gboolean result = FALSE; -+ -+ cogl_meta_texture_foreach_in_region (COGL_META_TEXTURE (texture), -+ 0.0f, 0.0f, /* tx_1 / ty_1 */ -+ 1.0f, 1.0f, /* tx_2 / ty_2 */ -+ COGL_PIPELINE_WRAP_MODE_REPEAT, -+ COGL_PIPELINE_WRAP_MODE_REPEAT, -+ texture_rectangle_check_cb, -+ &result); - -- return cogl_tex; -+ return result; - } -diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h -index b777316..7372b29 100644 ---- a/src/compositor/meta-texture-rectangle.h -+++ b/src/compositor/meta-texture-rectangle.h -@@ -30,15 +30,17 @@ - - G_BEGIN_DECLS - --CoglHandle -+CoglTexture * - meta_texture_rectangle_new (unsigned int width, - unsigned int height, -- CoglTextureFlags flags, - CoglPixelFormat format, -- GLenum internal_gl_format, -- GLenum internal_format, -+ CoglPixelFormat internal_format, - unsigned int rowstride, -- const guint8 *data); -+ const guint8 *data, -+ GError **error); -+ -+gboolean -+meta_texture_rectangle_check (CoglTexture *texture); - - G_END_DECLS - -diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c -index 0025472..2dee777 100644 ---- a/src/compositor/meta-texture-tower.c -+++ b/src/compositor/meta-texture-tower.c -@@ -98,18 +98,6 @@ meta_texture_tower_free (MetaTextureTower *tower) - g_slice_free (MetaTextureTower, tower); - } - --#ifdef GL_TEXTURE_RECTANGLE_ARB --static gboolean --texture_is_rectangle (CoglHandle texture) --{ -- GLuint gl_tex; -- GLenum gl_target; -- -- cogl_texture_get_gl_texture (texture, &gl_tex, &gl_target); -- return gl_target == GL_TEXTURE_RECTANGLE_ARB; --} --#endif /* GL_TEXTURE_RECTANGLE_ARB */ -- - /** - * meta_texture_tower_set_base_texture: - * @tower: a #MetaTextureTower -@@ -354,13 +342,11 @@ get_paint_level (int width, int height) - return (int)(0.5 + lambda); - } - --#ifdef GL_TEXTURE_RECTANGLE_ARB - static gboolean - is_power_of_two (int x) - { - return (x & (x - 1)) == 0; - } --#endif /* GL_TEXTURE_RECTANGLE_ARB */ - - static void - texture_tower_create_texture (MetaTextureTower *tower, -@@ -368,25 +354,23 @@ texture_tower_create_texture (MetaTextureTower *tower, - int width, - int height) - { --#ifdef GL_TEXTURE_RECTANGLE_ARB - if ((!is_power_of_two (width) || !is_power_of_two (height)) && -- texture_is_rectangle (tower->textures[level - 1])) -+ meta_texture_rectangle_check (tower->textures[level - 1])) - { - tower->textures[level] = - meta_texture_rectangle_new (width, height, -- 0, /* flags */ - /* data format */ - TEXTURE_FORMAT, -- /* internal GL format */ -- GL_RGBA, - /* internal cogl format */ - TEXTURE_FORMAT, - /* rowstride */ - width * 4, -+ /* data */ -+ NULL, -+ /* error */ - NULL); - } - else --#endif /* GL_TEXTURE_RECTANGLE_ARB */ - { - tower->textures[level] = cogl_texture_new_with_size (width, height, - COGL_TEXTURE_NO_AUTO_MIPMAP, --- -cgit v0.9.0.2 diff --git a/mutter.changes b/mutter.changes index 56c135d..09c5bec 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,103 @@ +------------------------------------------------------------------- +Tue Sep 4 08:33:25 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.91: + + Fix subtracting unredirected windows from visible region + (bgo#677116) + + Minor improvements and bugfixes (bgo#682648, bgo#682993) + + Updated translations. + + + +------------------------------------------------------------------- +Sun Sep 2 19:46:10 UTC 2012 - dimstar@opensuse.org + +- Split out libmutter0 to follow SLPP (bnc#706930). +- Change mutter requires to libmutter0: it's all what's needed to + develop against this library. +- Move /sbin/ldconfig calls from post/postun of the main package to + libmutter0. + +------------------------------------------------------------------- +Tue Aug 21 15:01:13 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.90: + + Fix logic for handling translations of the windows group + (bgo#681221) + + Handle painting inside a Clutter clone (bgo#681953) + + Update overlay-key on settings changes (bgo#681906) + + Add keybinding for overlay-key (bgo#665547) + + Minor fixes and improvements + + Updated translations. +- Drop gnome-doc-utils-devel BuildRequires: no longer needed. + +------------------------------------------------------------------- +Tue Aug 7 09:21:19 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.5: + + Fix flickering around windows when using window group + (bgo#681221) + + Updated translations. + +------------------------------------------------------------------- +Tue Jul 17 11:18:09 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.4: + + Make it possible to reimplement move-to-workspace keybindings + from plugins (bgo#674104) + + Add a preference to ignore hide-titlebar-when-maximized hint + (bgo#678947) + + window: Also use hide-titlebar-when-maximized when tiled + (bgo#679290) + + Center modal dialogs on their parent instead (bgo#674499) + + Reduce amount of markup in translated messages (bgo#679660) + + Fix focus problem after closing a window with + focus-follows-mouse (bgo#675982) + + Handle changes of the attach-modal-dialogs preference + (bgo#679904) + + Do not restore tiling on unmaximize (bgo#677565) + + Bugs fixed: bgo#673824, bgo#679153) + + Updated translations. + +------------------------------------------------------------------- +Mon Jun 25 21:13:05 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.3: + + Simplify plugin system [bgo#676855] + + meta-window-actor: Don't unredirect shaped windows [bgo#677657] + + screen: Add new public meta_screen_get_current_monitor API + [bgo#642591] + + frames: Increase the size of resize corners [bgo#677669] + + window: Make some window methods public [bgo#678126] + + Fix crash when running mutter stand-alone [bgo#678238] + + meta-window-actor: Fix potential crash in shaping code + [bgo#677977] + + Misc. fixes + + Updated translations. + +------------------------------------------------------------------- +Thu Jun 7 20:21:25 UTC 2012 - dimstar@opensuse.org + +- Update to version 3.5.2: + + keybindings: Remove 'toggle-recording' binding [bgo#674376] + + Switch to gtk-doc syntax [bgo#673752] + + shaped-texture: never slice shape mask texture [bgo#674731] + + Make Mutter stop relying on Cogl including a GL header + [bgo#672711] + + Make support for "XFree86" Xinerama mandatory [bgo#674727] + + meta_window_move_frame(): fix crash when frame is NULL + [bgo#675254] + + Fix memory leaks [bgo#672640] + + Code cleanups [bgo#671104, bgo#674876, bgo#676052] + + Look for themes in XDG user data dir [bgo#675316] + + Remove frame pixel caching [bgo#675111] + + stack: Ignore keep-on-top property on maximized windows + [bgo#673581] + + Misc. fixes + + Updated translations. +- Drop mutter-fix-crash-when-frame-is-NULL.patch: fixed upstream. +- Drop mutter-never-slice-shape-mask.patch: fixed upstream. +- Drop mutter-use-cogl-texrect-api.patch: fixed upstream. + ------------------------------------------------------------------- Thu May 31 14:25:43 UTC 2012 - fcrozat@suse.com diff --git a/mutter.spec b/mutter.spec index 5955328..853ee2e 100644 --- a/mutter.spec +++ b/mutter.spec @@ -17,21 +17,14 @@ Name: mutter -Version: 3.4.1 +Version: 3.5.91 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/mutter/3.4/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM mutter-fix-crash-when-frame-is-NULL.patch bgo#675254 zaitor@opensuse.org -- fixes crashes in extensions. -Patch0: mutter-fix-crash-when-frame-is-NULL.patch -# PATCH-FIX-UPSTREAM mutter-never-slice-shape-mask.patch bgo#674731 rh#813648 fcrozat@suse.com -- Fix window texturing on hardware without ARB_texture_non_power_of_two -Patch1: mutter-never-slice-shape-mask.patch -# PATCH-FIX-UPSTREAM mutter-use-cogl-texrect-api.patch bgo#672711 rh#813648 fcrozat@suse.com -- Fix window texturing on hardware without ARB_texture_non_power_of_two -Patch2: mutter-use-cogl-texrect-api.patch +Source: http://download.gnome.org/sources/mutter/3.5/%{name}-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: gnome-doc-utils-devel BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: intltool BuildRequires: libSM-devel @@ -69,6 +62,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Mutter is a window and compositing manager based on Clutter, forked from Metacity. +%package -n libmutter0 +Summary: Window and compositing manager based on Clutter -- Library +Group: System/Libraries + +%description -n libmutter0 +Mutter is a window and compositing manager based on Clutter, forked +from Metacity. + +This package contains a library for shared features. + %package tools Summary: Window and compositing manager based on Clutter -- Tools Group: System/GUI/GNOME @@ -84,7 +87,7 @@ test themes and a small application to test window managers. %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME -Requires: %{name} = %{version} +Requires: libmutter0 = %{version} %description devel This package contains all necessary include files and libraries needed @@ -94,9 +97,6 @@ to develop applications that require these. %lang_package %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 translation-update-upstream %if 0%{?BUILD_FROM_VCS} @@ -121,21 +121,22 @@ translation-update-upstream rm -rf %{buildroot} %post -/sbin/ldconfig %desktop_database_post %glib2_gsettings_schema_post +%post -n libmutter0 -p /sbin/ldconfig + %postun -/sbin/ldconfig %desktop_database_postun %glib2_gsettings_schema_postun +%postun -n libmutter0 -p /sbin/ldconfig + %files %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS rationales.txt README %{_bindir}/mutter %{_bindir}/mutter-message -%{_libdir}/libmutter.so.* %{_libdir}/mutter/ %exclude %{_libdir}/mutter/Meta-3.0.gir %{_datadir}/applications/mutter.desktop @@ -152,6 +153,10 @@ rm -rf %{buildroot} %{_datadir}/GConf/gsettings/mutter-schemas.convert %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml +%files -n libmutter0 +%defattr(-,root,root) +%{_libdir}/libmutter.so.* + %files tools %defattr (-, root, root) %{_bindir}/mutter-theme-viewer