OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=2

emacs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package emacs (Version 21.3)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,14 +13,14 @@
 Name:           emacs
 BuildRequires:  giflib-devel libpng-devel libtiff-devel update-desktop-files xaw3d xorg-x11-devel
 URL:            http://www.gnu.org/software/emacs/
-License:        GNU General Public License (GPL) - all versions
+License:        GNU General Public License (GPL)
 Group:          Productivity/Editors/Emacs
 Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger 
 Requires:       emacs-info ctags emacs_program
 Provides:       ge_site ge_exec
 Autoreqprov:    on
 Version:        21.3
-Release:        244
+Release:        259
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        GNU Emacs Base Package
 Source:         emacs-21.3.tar.bz2
@@ -37,6 +37,7 @@ Patch6:         emacs-21.3-asian-dired.patch
 Patch7:         emacs-21.1-asian-print.patch
 Patch8:         emacs-21.1-ps-bdf.patch
 Patch9:         emacs-21.3-config.dif
+Patch10:        emacs-21.3-x11r7.patch
 Patch11:        emacs-21.2-x86_64.patch
 Patch12:        emacs-21.3-ppc64.patch
 Patch13:        emacs-21.3-term.patch
@@ -49,9 +50,17 @@ Patch19:        emacs-21.3-sentinel.patch
 Patch20:        emacs-21.3-xim.patch
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
 %if "%_exec_prefix" == "/usr/X11R6"
-%define appDefaultsFile %{_exec_prefix}/lib/X11/app-defaults/Emacs
+%define _x11lib     %{_exec_prefix}/%{_lib}
+%define _x11data    %{_exec_prefix}/lib/X11
+%define _libx11     %{_x11data}
+%define _x11inc     %{_x11_prefix}/include
+%define appDefaultsFile %{_x11data}/app-defaults/Emacs
 %else
-%define appDefaultsFile %{_datadir}/X11/app-defaults/Emacs
+%define _x11lib     %{_libdir}
+%define _x11data    %{_datadir}/X11
+%define _libx11     %{_exec_prefix}/lib/X11
+%define _x11inc     %{_includedir}
+%define appDefaultsFile %{_x11data}/app-defaults/Emacs
 %endif
 
 %description
@@ -200,6 +209,7 @@ Authors:
 %patch7 -p0 -b .print
 %patch8 -p0 -b .psbdf
 %patch9 -p0 -b .conf
+%patch10 -p0 -b .x11r7
 %patch11 -p0 -b .hammer
 %patch13 -p0 -b .term
 %patch14 -p0 -b .mule
@@ -235,8 +245,8 @@ export CC CFLAGS LC_CTYPE LDFLAGS
 	 --with-gif \
 	 --with-png \
 	 --with-x-toolkit=lucid \
-	 --x-includes=/usr/X11R6/include \
-	 --x-libraries=/usr/X11R6/%{_lib} \
+	 --x-includes=%{_x11inc} \
+	 --x-libraries=%{_x11lib}:%{_x11data} \
 "
   NOX11="--with-x=no \
 "
@@ -2388,6 +2398,8 @@ done
 /usr/share/emacs/%{version}/lisp/xt-mouse.el
 
 %changelog -n emacs
+* Fri Jan 12 2007 - werner@suse.de
+- Make emacs find its app-default file (bug #234026)
 * Sat Nov 11 2006 - olh@suse.de
 - remove ppc/ppc64 ld.scripts
   fix elf handling on powerpc64