- mutter-2.28.1-add-needed.patch: Fix FTBFS from --no-add-needed

This commit is contained in:
Adam Jackson 2010-02-16 23:58:35 +00:00
parent 6bd12ec943
commit 6dde2f11a3
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -up mutter-2.28.1/src/tools/Makefile.am.jx mutter-2.28.1/src/tools/Makefile.am
--- mutter-2.28.1/src/tools/Makefile.am.jx 2010-01-25 11:07:32.000000000 -0500
+++ mutter-2.28.1/src/tools/Makefile.am 2010-02-16 18:59:50.000000000 -0500
@@ -26,7 +26,7 @@ noinst_PROGRAMS=mutter-mag mutter-graysc
mutter_message_LDADD= @MUTTER_MESSAGE_LIBS@
mutter_window_demo_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
-mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@
+mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@ -lm
mutter_grayscale_LDADD = @MUTTER_WINDOW_DEMO_LIBS@
EXTRA_DIST=$(icon_DATA)

View File

@ -9,7 +9,7 @@
Name: mutter
Version: 2.28.1
Release: 0.1%{?dist}
Release: 0.2%{?dist}
Summary: Window and compositing manager based on Clutter
Group: User Interface/Desktops
@ -18,6 +18,7 @@ URL: http://git.gnome.org/cgit/mutter
# Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
Source0: %{tarfile}
Patch0: mutter-fixKeySym.patch
Patch1: mutter-2.28.1-add-needed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: clutter-devel
@ -77,6 +78,7 @@ utilities for testing Metacity/Mutter themes.
%prep
%setup -q
%patch0 -p1 -b .fixKeySym
%patch1 -p1 -b .add-needed
# run autogen.sh until we have a proper release
NOCONFIGURE=yes ./autogen.sh
@ -166,6 +168,9 @@ gconftool-2 --makefile-install-rule \
%doc %{_mandir}/man1/mutter-window-demo.1.gz
%changelog
* Tue Feb 16 2010 Adam Jackson <ajax@redhat.com> 2.28.1-0.2
- mutter-2.28.1-add-needed.patch: Fix FTBFS from --no-add-needed
* Thu Feb 4 2010 Peter Robinson <pbrobinson@gmail.com> 2.28.1-0.1
- Move to git snapshot