rpms/metacity
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix linking with pedantic linkers

Browse Source
This commit is contained in:
Matthias Clasen 2010-02-27 04:04:40 +00:00
parent 5297b784d4
commit 3a2e69b34e
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs.patch Normal file
View File

@ -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)

5
metacity.spec
View File

@ -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