summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson <ajax@fedoraproject.org>2010-02-16 23:58:35 +0000
committerAdam Jackson <ajax@fedoraproject.org>2010-02-16 23:58:35 +0000
commit6dde2f11a387121d2e86c51bb8b38e1b7c274bb0 (patch)
tree9f8d3cdec5c7f89cefb4784b47876e224e16970b
parent6bd12ec94392d8f6f76b000727b4ab625a8cf4a7 (diff)
downloadmutter-6dde2f11a387121d2e86c51bb8b38e1b7c274bb0.tar.gz
mutter-6dde2f11a387121d2e86c51bb8b38e1b7c274bb0.tar.xz
mutter-6dde2f11a387121d2e86c51bb8b38e1b7c274bb0.zip
- mutter-2.28.1-add-needed.patch: Fix FTBFS from --no-add-needed
-rw-r--r--mutter-2.28.1-add-needed.patch12
-rw-r--r--mutter.spec7
2 files changed, 18 insertions, 1 deletions
diff --git a/mutter-2.28.1-add-needed.patch b/mutter-2.28.1-add-needed.patch
new file mode 100644
index 0000000..cce72e9
--- /dev/null
+++ b/mutter-2.28.1-add-needed.patch
@@ -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)
diff --git a/mutter.spec b/mutter.spec
index 8abb68c..382d05d 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -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