diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2010-02-27 04:04:40 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2010-02-27 04:04:40 +0000 |
| commit | 3a2e69b34e35e4a8d378eeb082cd2b097f33b1b9 (patch) | |
| tree | 4cb0785dbf11916d3a7ac56eb69d6bc860a80c08 | |
| parent | 5297b784d4c6c8789c97370fc439c05aa7c9cc81 (diff) | |
| download | metacity-3a2e69b34e35e4a8d378eeb082cd2b097f33b1b9.tar.gz metacity-3a2e69b34e35e4a8d378eeb082cd2b097f33b1b9.tar.xz metacity-3a2e69b34e35e4a8d378eeb082cd2b097f33b1b9.zip | |
fix linking with pedantic linkersmetacity-2_28_1-3_fc14
| -rw-r--r-- | libs.patch | 12 | ||||
| -rw-r--r-- | metacity.spec | 5 |
2 files changed, 16 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 811a383..12be680 100644 --- a/metacity.spec +++ b/metacity.spec @@ -38,6 +38,8 @@ Patch24: metacity-2.28-empty-keybindings.patch # https://bugzilla.gnome.org/show_bug.cgi?id=604319 Patch25: metacity-2.28-xioerror-unknown-display.patch +Patch26: libs.patch + License: GPLv2+ Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -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 @@ -220,7 +223,7 @@ fi %changelog * Fri Feb 26 2010 Matthias Clasen <mclasen@redhat.com> - 2.28.1-3 -- Rebuild +- 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 |