diff options
| -rw-r--r-- | keysdir.patch | 25 | ||||
| -rw-r--r-- | metacity.spec | 12 |
2 files changed, 34 insertions, 3 deletions
diff --git a/keysdir.patch b/keysdir.patch new file mode 100644 index 0000000..0726f58 --- /dev/null +++ b/keysdir.patch @@ -0,0 +1,25 @@ +diff -up metacity-2.19.21/configure.in.keysdir metacity-2.19.21/configure.in +--- metacity-2.19.21/configure.in.keysdir 2007-06-10 23:34:39.000000000 -0400 ++++ metacity-2.19.21/configure.in 2007-07-05 16:50:29.000000000 -0400 +@@ -176,6 +176,9 @@ else + AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required") + fi + ++GNOME_KEYBINDINGS_KEYSDIR=$($PKG_CONFIG --variable keysdir gnome-keybindings) ++AC_SUBST(GNOME_KEYBINDINGS_KEYSDIR) ++ + STARTUP_NOTIFICATION_VERSION=0.7 + AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION]) + if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then +diff -up metacity-2.19.21/src/Makefile.am.keysdir metacity-2.19.21/src/Makefile.am +--- metacity-2.19.21/src/Makefile.am.keysdir 2007-04-05 14:45:12.000000000 -0400 ++++ metacity-2.19.21/src/Makefile.am 2007-07-05 16:51:07.000000000 -0400 +@@ -163,7 +163,7 @@ schema_DATA = $(schema_in_files:.schemas + + @INTLTOOL_XML_NOMERGE_RULE@ + +-xmldir = $(datadir)/control-center/keybindings ++xmldir = @GNOME_KEYBINDINGS_KEYSDIR@ + xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in + xml_DATA = $(xml_in_files:.xml.in=.xml) + diff --git a/metacity.spec b/metacity.spec index 2fc25f2..8cdbbcd 100644 --- a/metacity.spec +++ b/metacity.spec @@ -7,9 +7,10 @@ Summary: Metacity window manager Name: metacity Version: %{metacity_version} -Release: 1%{?dist} +Release: 2%{?dist} URL: http://download.gnome.org/sources/metacity/ Source0: http://download.gnome.org/sources/metacity/2.19/%{metacity_filename}.tar.bz2 +Patch0: keysdir.patch License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,6 +27,8 @@ BuildRequires: xorg-x11-proto-devel >= 7.0-13 BuildRequires: libSM-devel, libICE-devel, libX11-devel BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel BuildRequires: libXcursor-devel +# for gnome-keybindings.pc +BuildRequires: control-center >= 2.19.4 Requires: startup-notification >= 0.7 Requires: redhat-artwork >= 0.62 @@ -62,7 +65,7 @@ API. This package exists purely for technical reasons. %prep %setup -q -n %{metacity_filename} - +%patch0 -p1 -b .keysdir %build rm -rf $RPM_BUILD_ROOT @@ -133,7 +136,7 @@ fi %{_sysconfdir}/gconf/schemas/*.schemas %{_datadir}/metacity %{_datadir}/themes/* -%{_datadir}/control-center/keybindings/* +%{_datadir}/gnome-control-center/keybindings/* %{_libdir}/lib*.so.* %{_mandir}/man1/metacity.1.gz @@ -148,6 +151,9 @@ fi %{_mandir}/man1/metacity-window-demo.1.gz %changelog +* Thu Jul 5 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.21-2 +- Fix keybindings + * Mon Jun 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.21-1 - Update to 2.19.21 |