SHA256
1
0
forked from pool/emacs
Dr. Werner Fink 2010-03-26 17:37:31 +00:00 committed by Git OBS Bridge
parent 9133e96c27
commit 2e5fcf18c7
2 changed files with 13 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 26 18:32:03 CET 2010 - werner@suse.de
- Do not remove wrapper script for bug bnc#555682 (bnc#589394)
-------------------------------------------------------------------
Wed Mar 17 14:25:12 CET 2010 - werner@suse.de

View File

@ -59,6 +59,7 @@ 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)}
@ -247,10 +248,11 @@ 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
%patch -P 18 -p1
%patch20 -p0 -b .gcc45
%build
CC=gcc-4.3
@ -583,6 +585,7 @@ done
/etc/skel/.gnu-emacs
%{_bindir}/b2m
%{_bindir}/ebrowse
%{_bindir}/emacs
%{_bindir}/emacsclient
%{_bindir}/grep-changelog
%{_bindir}/rcs-checkin
@ -2700,13 +2703,13 @@ done
%files -n emacs-nox
%defattr(-, root, root)
/usr/bin/emacs-nox
%{_bindir}/emacs-nox
%files -n emacs-x11
%defattr(-, root, root)
/usr/bin/emacs
/usr/bin/emacs-x11
/usr/bin/emacs-gtk
%{_bindir}/emacs
%{_bindir}/emacs-x11
%{_bindir}/emacs-gtk
%{appDefaultsFile}
%{_datadir}/applications/emacs.desktop
%{_datadir}/pixmaps/emacs.png