OBS User unknown
2007-12-20 15:41:58 +00:00
committed by Git OBS Bridge
parent 3f07fbc511
commit f900bfb1d2
3 changed files with 25 additions and 3 deletions

View File

@@ -20,7 +20,7 @@ Requires: emacs-info ctags emacs_program
Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc
AutoReqProv: on
Version: 22.1
Release: 69
Release: 70
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: GNU Emacs Base Package
Source: emacs-22.1.tar.bz2
@@ -46,6 +46,7 @@ Patch13: emacs-22.0.99-s390x.dif
Patch14: emacs-22.1-conf.diff
Patch15: emacs-22.1-CVE-2007-5795.dif
Patch16: emacs-22.1-format.diff
Patch17: emacs-22.1-iconic.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 _x11lib %{_exec_prefix}/%{_lib}
@@ -213,9 +214,10 @@ Authors:
%patch11 -p0 -b .xim
%patch12 -p0 -b .x11r7
%patch13 -p0 -b .s390x
%patch14
%patch14 -p0 -b .conf
%patch15 -p0 -b .CVE20075795
%patch16
%patch16 -p0 -b .format
%patch17 -p0 -b .iconic
%patch
if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
install-mh -auto < /dev/null
@@ -418,6 +420,7 @@ rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/loaddefs.el.psbdf
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/ps-bdf.el.psbdf
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/ps-mule.el.print
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/ps-mule.el.mule
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/startup.el.iconic
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/textmodes/ispell.el.mule
rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/term.el.term
rm -vf %{buildroot}/usr/share/emacs/%{version}/etc/ctags.1
@@ -3241,6 +3244,8 @@ done
/usr/share/emacs/%{version}/lisp/xt-mouse.el.gz
%changelog
* Thu Dec 20 2007 - werner@suse.de
- Suppress startup message in case of starting iconic (bug #342385)
* Tue Dec 18 2007 - werner@suse.de
- Add workaround for conflict between GTK/GDK and KWin by using
Athena/Xaw3d toolkit in case of running within a KDE session.