Accepting request 36231 from editors

checked in (request 36231)

OBS-URL: https://build.opensuse.org/request/show/36231
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=26

emacs.spec

@@ -59,7 +59,6 @@ Patch16:        emacs-23.1-flyspell.patch
 Patch17:        emacs-23.1-bnc558884.patch
 Patch18:        emacs-sparc.diff
 Patch19:        emacs-23.1-fix_cpp.patch
-Patch20:        emacs-23.1-gcc45.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global bug_345669  0
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -248,11 +247,10 @@ Authors:
 %patch17 -p0 -b .gtkmenus
 %patch19 -p1 -b .configure
 %patch
-%patch18 -p1 -b .sparc
 if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
     install-mh -auto < /dev/null
 fi
-%patch20 -p0 -b .gcc45
+%patch -P 18 -p1
 
 %build
   CC=gcc-4.3
@@ -585,7 +583,6 @@ done
 /etc/skel/.gnu-emacs
 %{_bindir}/b2m
 %{_bindir}/ebrowse
-%{_bindir}/emacs
 %{_bindir}/emacsclient
 %{_bindir}/grep-changelog
 %{_bindir}/rcs-checkin
@@ -2703,13 +2700,13 @@ done
 
 %files       -n emacs-nox
 %defattr(-, root, root)
-%{_bindir}/emacs-nox
+/usr/bin/emacs-nox
 
 %files       -n emacs-x11
 %defattr(-, root, root)
-%{_bindir}/emacs
-%{_bindir}/emacs-x11
-%{_bindir}/emacs-gtk
+/usr/bin/emacs
+/usr/bin/emacs-x11
+/usr/bin/emacs-gtk
 %{appDefaultsFile}
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/pixmaps/emacs.png