Mailinglist Archive: opensuse-commit (1215 mails)

< Previous Next >
commit mutter for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 01 Aug 2009 13:11:52 +0200
  • Message-id: <20090801111153.00FF98EC79@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package mutter for openSUSE:Factory
checked in at Sat Aug 1 13:11:52 CEST 2009.


--------
New Changes file:

--- /dev/null 2009-04-14 11:55:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/mutter/mutter.changes 2009-07-21
21:12:25.000000000 +0200
@@ -0,0 +1,22 @@
+-------------------------------------------------------------------
+Tue Jul 21 21:12:15 CEST 2009 - vuntz@xxxxxxxxxx
+
+- Update to version 2.27.1, first official tarball.
+- Add mutter-build-fix.patch to fix build.
+
+-------------------------------------------------------------------
+Thu May 14 14:38:54 CEST 2009 - vuntz@xxxxxxxxxx
+
+- Update to git version as of May 14th.
+
+-------------------------------------------------------------------
+Mon May 4 02:36:08 CEST 2009 - vuntz@xxxxxxxxxx
+
+- Add tarball created from git, and mutter-rename.patch.bz2 to make
+ mutter parallel-installable with metacity.
+
+-------------------------------------------------------------------
+Fri May 1 19:12:10 CEST 2009 - vuntz@xxxxxxxxxx
+
+- Initial package, based on the metacity package.
+

calling whatdependson for head-i586


New:
----
mutter-2.27.1.tar.bz2
mutter-build-fix.patch
mutter.changes
mutter.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mutter.spec ++++++
#
# spec file for package mutter (Version 2.27.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild


Name: mutter
BuildRequires: clutter-devel
BuildRequires: fdupes
BuildRequires: gconf2-devel
BuildRequires: gir-repository
BuildRequires: gnome-doc-utils-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: startup-notification-devel
BuildRequires: update-desktop-files
BuildRequires: zenity
# Needed by the patch
BuildRequires: gnome-common
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.27.1
Release: 1
Summary: Window and compositing manager based on Clutter
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM mutter-build-fix.patch vuntz@xxxxxxxxxx -- Taken from git
Patch0: mutter-build-fix.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: zenity
Requires: %{name}-lang = %{version}
Provides: windowmanager
%gconf_schemas_prereq

%description
Mutter is a window and compositing manager based on Clutter, forked
from Metacity.

%package devel
License: GPL v2 or later
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/GNOME
Requires: %{name} = %{version}
Requires: clutter-devel
Requires: gtk2-devel

%description devel
This package contains all necessary include files and libraries needed
to develop applications that require these.


%lang_package
%prep
%setup -q
%patch0 -p1

%build
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--libexecdir=%{_prefix}/lib/%{name} \
--disable-static \
--disable-schemas-install
%__make %{?jobs:-j%jobs}

%install
%makeinstall
%{__rm} %{buildroot}/%{_libdir}/*.la
%suse_update_desktop_file %{name}
%find_lang %{name}
%find_gconf_schemas
%fdupes %{buildroot}

%clean
rm -rf %{buildroot}

%pre -f %{name}.schemas_pre

%post -p /sbin/ldconfig

%posttrans -f %{name}.schemas_posttrans

%preun -f %{name}.schemas_preun

%postun -p /sbin/ldconfig

%files -f %{name}.schemas_list
%defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS rationales.txt README
%{_bindir}/*
%{_libdir}/*.so.*
%{_libdir}/mutter
%{_datadir}/applications/mutter.desktop
%{_datadir}/mutter
# Do not depend on libgnome just for a directory
%dir %{_datadir}/gnome
%dir %{_datadir}/gnome/wm-properties
%{_datadir}/gnome/wm-properties/mutter-wm.desktop
%doc %{_mandir}/man*/*

%files lang -f %{name}.lang
%if %suse_version <= 1110
# exclude locales which don't exist on old versions of openSUSE
%exclude %{_datadir}/locale/ha/LC_MESSAGES/*
%exclude %{_datadir}/locale/ig/LC_MESSAGES/*
%exclude %{_datadir}/locale/la/LC_MESSAGES/*
%endif

%files devel
%defattr (-, root, root)
%{_includedir}/mutter
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%changelog
++++++ mutter-build-fix.patch ++++++
commit ec2c197e1fa12698850b655da054e5528ce8a727
Author: Owen W. Taylor <otaylor@xxxxxxxxxxxx>
Date: Fri Jul 17 07:51:21 2009 -0400

Fix confusion about MetaPreview in introspection build

MetaPreview is only built into libmutter-private, and not included in
the mutter executable. Linking mutter against libmutter-private was
inadvertently added when the introspection build process was set up,
but isn't actually needed, and if -Wl,-as-needed is added during the
build process, then the libmutter-private dependency will be skipped.

* Don't link mutter (or the test programs) against libmutter-private

* Exclude meta-preview.h from the set of headers we feed into the
introspection build process

Reported by Patryk Zawadzki

http://bugzilla.gnome.org/show_bug.cgi?id=587975

diff --git a/src/Makefile.am b/src/Makefile.am
index c51a339..b675ab8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -147,6 +147,8 @@ libmutter_private_la_LIBADD = @MUTTER_LIBS@

libmutterincludedir = $(includedir)/mutter/mutter-private

+# Headers installed for plugins; introspected information will
+# be extracted into Mutter-<version>.gir
libmutterinclude_base_headers = \
include/alttabhandler.h \
include/boxes.h \
@@ -154,7 +156,6 @@ libmutterinclude_base_headers = \
include/main.h \
include/util.h \
include/common.h \
- ui/preview-widget.h \
ui/theme-parser.h \
ui/theme.h \
include/prefs.h \
@@ -171,7 +172,10 @@ libmutterinclude_base_headers = \
include/mutter-window.h

# Excluded from scanning for introspection but installed
+# preview-widget.h: only part of libmutter-private
+# atomnames.h: macros cause problems for scanning process
libmutterinclude_extra_headers = \
+ ui/preview-widget.h \
include/atomnames.h

libmutterinclude_HEADERS = \
@@ -221,7 +225,7 @@ Meta-$(api_version).typelib: $(G_IR_COMPILER)
Meta-$(api_version).gir
endif

EFENCE=
-mutter_LDADD=@MUTTER_LIBS@ libmutter-private.la $(EFENCE)
+mutter_LDADD=@MUTTER_LIBS@ $(EFENCE)
mutter_LDFLAGS=-export-dynamic

mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la
@@ -232,9 +236,9 @@ testasyncgetprop_SOURCES=core/async-getprop.h
core/async-getprop.c core/testasyn

noinst_PROGRAMS=testboxes testgradient testasyncgetprop

-testboxes_LDADD= @MUTTER_LIBS@ libmutter-private.la
-testgradient_LDADD= @MUTTER_LIBS@ libmutter-private.la
-testasyncgetprop_LDADD= @MUTTER_LIBS@ libmutter-private.la
+testboxes_LDADD= @MUTTER_LIBS@
+testgradient_LDADD= @MUTTER_LIBS@
+testasyncgetprop_LDADD= @MUTTER_LIBS@

@INTLTOOL_DESKTOP_RULE@


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread