From 0c211f11d8cf273bf77d9f0ecfa1e28087f88513b1afce3e778a8ebd4d9696d8 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 5 Apr 2010 16:44:09 +0000 Subject: [PATCH 1/3] Accepting request 36948 from home:oertel:branches:openSUSE:Factory Copy from home:oertel:branches:openSUSE:Factory/emacs via accept of submit request 36948 revision 4. Request was accepted with message: forward to factory OBS-URL: https://build.opensuse.org/request/show/36948 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=29 --- emacs.changes | 6 ++++++ emacs.spec | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/emacs.changes b/emacs.changes index 831f741..164e3ca 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 277310f..589bb06 100644 --- a/emacs.spec +++ b/emacs.spec @@ -457,7 +457,16 @@ cat > %{buildroot}/usr/bin/emacs <<-"EOF" #!/bin/bash # Possible values are nox, gtk, or x11 : ${EMACS_TOOLKIT:=gtk} - exec -a ${0} ${0}-${EMACS_TOOLKIT} ${1+"$@"} + 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 EOF %endif chmod 0755 %{buildroot}/usr/bin/emacs From a06ec2bfcc5458fb627acc21daea1bc97bf40aabe782886365d7dff2ae86be3a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 5 Apr 2010 16:46:55 +0000 Subject: [PATCH 2/3] 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 From 51c4bf6fc468d6dbbb1fab2d87b5f5f9edff998afea7cc9c536384a7a13dfc4f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 5 Apr 2010 16:46:56 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/emacs revision 48.0 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=3032e43ebef726e04604ea9fa56b594f --- emacs.changes | 6 ++++++ emacs.spec | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/emacs.changes b/emacs.changes index 831f741..164e3ca 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 277310f..8f9a4c4 100644 --- a/emacs.spec +++ b/emacs.spec @@ -25,7 +25,7 @@ Url: http://www.gnu.org/software/emacs/ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 11 +Release: 12 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} @@ -457,7 +457,16 @@ cat > %{buildroot}/usr/bin/emacs <<-"EOF" #!/bin/bash # Possible values are nox, gtk, or x11 : ${EMACS_TOOLKIT:=gtk} - exec -a ${0} ${0}-${EMACS_TOOLKIT} ${1+"$@"} + 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 EOF %endif chmod 0755 %{buildroot}/usr/bin/emacs