From a06ec2bfcc5458fb627acc21daea1bc97bf40aabe782886365d7dff2ae86be3a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 5 Apr 2010 16:46:55 +0000 Subject: [PATCH] Accepting request 36949 from editors checked in (request 36949) OBS-URL: https://build.opensuse.org/request/show/36949 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=30 --- emacs.changes | 6 ------ emacs.spec | 11 +---------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/emacs.changes b/emacs.changes index 164e3ca..831f741 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Mon Apr 5 18:32:53 CEST 2010 - ro@suse.de - -- make emacs wrapper script a little more smart - check if default toolkit is installed, else use fallbacks - ------------------------------------------------------------------- Sun Apr 4 15:39:02 CEST 2010 - ro@suse.de diff --git a/emacs.spec b/emacs.spec index 589bb06..277310f 100644 --- a/emacs.spec +++ b/emacs.spec @@ -457,16 +457,7 @@ cat > %{buildroot}/usr/bin/emacs <<-"EOF" #!/bin/bash # Possible values are nox, gtk, or x11 : ${EMACS_TOOLKIT:=gtk} - if test -e ${0}-${EMACS_TOOLKIT} ; then - exec -a ${0} ${0}-${EMACS_TOOLKIT} ${1+"$@"} - elif test -e ${0}-x11 ; then - exec -a ${0} ${0}-x11 ${1+"$@"} - elif test -e ${0}-nox ; then - exec -a ${0} ${0}-nox ${1+"$@"} - else - echo "no emacs binary found" - exit 1 - fi + exec -a ${0} ${0}-${EMACS_TOOLKIT} ${1+"$@"} EOF %endif chmod 0755 %{buildroot}/usr/bin/emacs