rpms/metacity/devel keysdir.patch, NONE, 1.1 metacity.spec, 1.118, 1.119
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Thu Jul 5 21:09:30 UTC 2007
- Previous message (by thread): rpms/chess/F-7 chess-ogre14.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 chess.spec, 1.6, 1.7 sources, 1.2, 1.3
- Next message (by thread): rpms/kernel/devel kernel-2.6.spec, 1.3273, 1.3274 linux-2.6-debug-boot-delay.patch, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/extras/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12055
Modified Files:
metacity.spec
Added Files:
keysdir.patch
Log Message:
fix keybindings
keysdir.patch:
--- NEW FILE keysdir.patch ---
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)
Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- metacity.spec 18 Jun 2007 17:13:08 -0000 1.118
+++ metacity.spec 5 Jul 2007 21:08:54 -0000 1.119
@@ -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: 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 @@
%prep
%setup -q -n %{metacity_filename}
-
+%patch0 -p1 -b .keysdir
%build
rm -rf $RPM_BUILD_ROOT
@@ -133,7 +136,7 @@
%{_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 @@
%{_mandir}/man1/metacity-window-demo.1.gz
%changelog
+* Thu Jul 5 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.21-2
+- Fix keybindings
+
* Mon Jun 18 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.21-1
- Update to 2.19.21
- Previous message (by thread): rpms/chess/F-7 chess-ogre14.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 chess.spec, 1.6, 1.7 sources, 1.2, 1.3
- Next message (by thread): rpms/kernel/devel kernel-2.6.spec, 1.3273, 1.3274 linux-2.6-debug-boot-delay.patch, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list