Accepting request 61097 from home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/61097
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=49

_service

@@ -1,6 +0,0 @@
-<services>
-<!--
-  <service name="tar_scm"><param name="versionprefix">2.91.5git</param><param name="url">git://git.gnome.org/mutter</param><param name="scm">git</param></service>
-<service name="recompress"><param name="file">*.tar</param><param name="compression">bz2</param></service><service name="set_version"/>
--->
-</services>

mutter.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Feb 13 16:53:09 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %desktop_database_post/postun because the package ships at
+    least one desktop file.
+- Pass %{?no_lang_C} to %find_lang so that english documentation
+  can be packaged with the program, and not in the lang subpackage.
+- Change Requires of lang subpackage to Recommends, since the
+  english documentation is not there anymore.
+
 -------------------------------------------------------------------
 Fri Feb 11 12:31:50 UTC 2011 - fcrozat@novell.com
 
@@ -12,9 +23,15 @@ Fri Feb 11 12:31:50 UTC 2011 - fcrozat@novell.com
   + Fix compiler warnings that were causing compilation failures
   + Misc bug fixes
   + Updated translations.
+- Add support for source service checkout, with %BUILD_FROM_VCS:
+  + Add gnome-common BuildRequires.
+  + Add call to ./autogen.sh.
+- Change libcanberra-devel BuildRequires to
+  pkgconfig(libcanberra-gtk).
+- Remove --with-gtk=3.0 configure option: it's always built against
+  GTK+ 3 now.
 
 -------------------------------------------------------------------
-
 Fri Jan 14 15:12:29 CET 2011 - vuntz@opensuse.org
 
 - Update to version 2.91.5:

mutter.spec

@@ -26,10 +26,10 @@ BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gobject-introspection-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  intltool
-BuildRequires:  pkgconfig(libcanberra-gtk)
 BuildRequires:  startup-notification-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  zenity
+BuildRequires:  pkgconfig(libcanberra-gtk)
 %if 0%{?BUILD_FROM_VCS}
 BuildRequires:  gnome-common
 %endif
@@ -43,7 +43,7 @@ Source:         %{name}-%{version}.tar.bz2
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       zenity
-Requires:       %{name}-lang = %{version}
+Recommends:     %{name}-lang
 Provides:       windowmanager
 %gconf_schemas_prereq
 
@@ -86,7 +86,7 @@ to develop applications that require these.
 %endif
 %{__rm} %{buildroot}/%{_libdir}/*.la
 %suse_update_desktop_file %{name}
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
 %fdupes %{buildroot}
 
@@ -95,13 +95,17 @@ rm -rf %{buildroot}
 
 %pre -f %{name}.schemas_pre
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%desktop_database_post
 
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+%desktop_database_postun
 
 %files -f %{name}.schemas_list
 %defattr (-, root, root)