From 453947caacbefb994b4cbc66267ce65b1683bbd9022e6e02927dbd55c85f413d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 1 Aug 2009 11:11:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=1 --- .gitattributes | 23 ++++++++ .gitignore | 1 + mutter-2.27.1.tar.bz2 | 3 + mutter-build-fix.patch | 75 ++++++++++++++++++++++++ mutter.changes | 22 +++++++ mutter.spec | 129 +++++++++++++++++++++++++++++++++++++++++ ready | 0 7 files changed, 253 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 mutter-2.27.1.tar.bz2 create mode 100644 mutter-build-fix.patch create mode 100644 mutter.changes create mode 100644 mutter.spec create mode 100644 ready diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/mutter-2.27.1.tar.bz2 b/mutter-2.27.1.tar.bz2 new file mode 100644 index 0000000..d7d8db9 --- /dev/null +++ b/mutter-2.27.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab6808554cf74a61ffabf629626237e29637aea7e9773ce7c6f20a88cbac1619 +size 1995506 diff --git a/mutter-build-fix.patch b/mutter-build-fix.patch new file mode 100644 index 0000000..f2754a6 --- /dev/null +++ b/mutter-build-fix.patch @@ -0,0 +1,75 @@ +commit ec2c197e1fa12698850b655da054e5528ce8a727 +Author: Owen W. Taylor +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-.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@ + diff --git a/mutter.changes b/mutter.changes new file mode 100644 index 0000000..12a87e5 --- /dev/null +++ b/mutter.changes @@ -0,0 +1,22 @@ +------------------------------------------------------------------- +Tue Jul 21 21:12:15 CEST 2009 - vuntz@novell.com + +- 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@novell.com + +- Update to git version as of May 14th. + +------------------------------------------------------------------- +Mon May 4 02:36:08 CEST 2009 - vuntz@novell.com + +- 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@novell.com + +- Initial package, based on the metacity package. + diff --git a/mutter.spec b/mutter.spec new file mode 100644 index 0000000..27cd130 --- /dev/null +++ b/mutter.spec @@ -0,0 +1,129 @@ +# +# 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@novell.com -- 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 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4