From 03351fceac95310db5c529e6493b908ca45caa0b3b08504358f5466564d66265 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 9 Sep 2010 09:58:53 +0000 Subject: [PATCH] Accepting request 47557 from home:a_jaeger:branches:openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/47557 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=35 --- emacs.changes | 10 ++++++++++ emacs.spec | 11 ++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/emacs.changes b/emacs.changes index b217c68..1574638 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Sep 7 12:54:28 UTC 2010 - aj@suse.de + +- BuildRequire gpm-devel + +------------------------------------------------------------------- +Thu May 20 12:44:38 CEST 2010 - werner@suse.de + +- Correct macro name in spec file + ------------------------------------------------------------------- Tue Apr 27 16:19:58 CEST 2010 - werner@suse.de diff --git a/emacs.spec b/emacs.spec index 56755c9..b35a0d8 100644 --- a/emacs.spec +++ b/emacs.spec @@ -19,13 +19,18 @@ Name: emacs -BuildRequires: alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel giflib-devel gpm gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel +BuildRequires: alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel giflib-devel gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel BuildRequires: gcc43 +%if 0%{?suse_version} > 1130 +BuildRequires: gpm-devel +%else +BuildRequires: gpm +%endif Url: http://www.gnu.org/software/emacs/ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 13 +Release: 14 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -68,7 +73,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _x11lib %{_exec_prefix}/%{_lib} %define _x11data %{_exec_prefix}/lib/X11 %define _libx11 %{_x11data} -%define _x11inc %{_x11_prefix}/include +%define _x11inc %{_exec_prefix}/include %define appDefaultsFile %{_x11data}/app-defaults/Emacs %else %define _x11lib %{_libdir}