diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2010-02-27 04:18:27 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2010-02-27 04:18:27 +0000 |
| commit | 669c5c5bb8a4f39e73064525e5430193b1a2057b (patch) | |
| tree | cfaa1549f0356bcc98612ea5e4244eb9e4803c39 | |
| parent | 9017a8ed69ec27e025a57ee0146a901d36c190c4 (diff) | |
| download | metacity-2_28_1-3_fc13.tar.gz metacity-2_28_1-3_fc13.tar.xz metacity-2_28_1-3_fc13.zip | |
fix buildmetacity-2_28_1-3_fc13
| -rw-r--r-- | libs.patch | 12 | ||||
| -rw-r--r-- | metacity.spec | 8 |
2 files changed, 19 insertions, 1 deletions
diff --git a/libs.patch b/libs.patch new file mode 100644 index 0000000..d39a64f --- /dev/null +++ b/libs.patch @@ -0,0 +1,12 @@ +diff -up metacity-2.28.1/src/tools/Makefile.am.libs metacity-2.28.1/src/tools/Makefile.am +--- metacity-2.28.1/src/tools/Makefile.am.libs 2010-02-26 23:00:43.446410930 -0500 ++++ metacity-2.28.1/src/tools/Makefile.am 2010-02-26 23:00:55.805414773 -0500 +@@ -26,7 +26,7 @@ noinst_PROGRAMS=metacity-mag metacity-gr + + metacity_message_LDADD= @METACITY_MESSAGE_LIBS@ + metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@ +-metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ ++metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -lm + metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@ + + EXTRA_DIST=$(icon_DATA) diff --git a/metacity.spec b/metacity.spec index c29f1be..5a64c4c 100644 --- a/metacity.spec +++ b/metacity.spec @@ -3,7 +3,7 @@ Summary: Unobtrusive window manager Name: metacity Version: 2.28.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://download.gnome.org/sources/metacity/ Source0: http://download.gnome.org/sources/metacity/2.28/metacity-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=558723 @@ -37,6 +37,8 @@ Patch21: Dont-warn-about-a-missing-session-file.patch Patch24: metacity-2.28-empty-keybindings.patch # https://bugzilla.gnome.org/show_bug.cgi?id=604319 Patch25: metacity-2.28-xioerror-unknown-display.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=611260 +Patch26: libs.patch License: GPLv2+ Group: User Interface/Desktops @@ -112,6 +114,7 @@ API. This package exists purely for technical reasons. %patch21 -p1 -b .missing-session %patch24 -p1 -b .empty-keybindings %patch25 -p1 -b .xioerror-unknown-display +%patch26 -p1 -b .libs # force regeneration rm src/metacity.schemas @@ -219,6 +222,9 @@ fi %{_mandir}/man1/metacity-window-demo.1.gz %changelog +* Fri Feb 26 2010 Matthias Clasen <mclasen@redhat.com> - 2.28.1-3 +- Fix linking with pedantic linkers + * Wed Jan 27 2010 Owen Taylor <otaylor@redhat.com> - 2.28.1-2 - Update to 2.28.1, remove 7 patches now applied upstream |