diff --git a/emacs-22.0.99.dif b/emacs-22.0.99.dif index 2c61872..0ca3173 100644 --- a/emacs-22.0.99.dif +++ b/emacs-22.0.99.dif @@ -1146,11 +1146,12 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von linux.el --- site-lisp/term/locale.el -+++ site-lisp/term/locale.el 2003-07-23 18:08:56.000000000 +0200 -@@ -0,0 +1,33 @@ ++++ site-lisp/term/locale.el 2007-06-04 15:26:38.703969552 +0200 +@@ -0,0 +1,37 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/locale.el for site-lisp path +;;; Copyright (c) 1996-2003 SuSE Linux AG Nuernberg, Germany. ++;;; Copyright (c) 2007 SuSE LINUX Products GmbH Nuernberg, Germany. +;;; +;;; Author: Werner Fink , No warranty of any kind +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1178,6 +1179,9 @@ + +(add-hook 'term-setup-hook (function (lambda () + (load "term/func-keys" t t)))) ++;; Nowadays ++(if window-system ++ (setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT STRING TEXT))) +;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von locale.el diff --git a/emacs-22.0.99.tar.bz2 b/emacs-22.0.99.tar.bz2 deleted file mode 100644 index 8ce8299..0000000 --- a/emacs-22.0.99.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b453fcc488a9cd26e985a5c806929a24831ce249b9f8a7dc7595095d82905ee5 -size 20650424 diff --git a/emacs-22.0.99-conf.diff b/emacs-22.1-conf.diff similarity index 59% rename from emacs-22.0.99-conf.diff rename to emacs-22.1-conf.diff index 83ee57e..987f129 100644 --- a/emacs-22.0.99-conf.diff +++ b/emacs-22.1-conf.diff @@ -9,11 +9,3 @@ dnl This used to use changequote, but, apart from `changequote is evil' dnl per the autoconf manual, we can speed up autoconf somewhat by quoting -@@ -1626,7 +1626,6 @@ - LIBSOUND="$LIBSOUND $ALSA_LIBS" - CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" - AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.]) -- AC_SUBST() - fi - AC_SUBST(CFLAGS_SOUND) - fi diff --git a/emacs-22.1.tar.bz2 b/emacs-22.1.tar.bz2 new file mode 100644 index 0000000..08a9f58 --- /dev/null +++ b/emacs-22.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43853daeb7552684a359d4e63f9215b44f2d709ba3376996007e72f619ec8608 +size 30480246 diff --git a/emacs.changes b/emacs.changes index d0fbede..44b60a4 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jun 4 17:32:44 CEST 2007 - werner@suse.de + +- Update ot final emacs version 22.1 + +------------------------------------------------------------------- +Mon Jun 4 15:28:38 CEST 2007 - werner@suse.de + +- Make UTF-8 default if request within X window text selections + ------------------------------------------------------------------- Fri Jun 1 17:12:35 CEST 2007 - dmueller@suse.de diff --git a/emacs.spec b/emacs.spec index c75efea..2ba26f7 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,5 +1,5 @@ # -# spec file for package emacs (Version 22.0.99) +# spec file for package emacs (Version 22.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,11 +19,11 @@ Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mu Requires: emacs-info ctags emacs_program Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc Autoreqprov: on -Version: 22.0.99 -Release: 10 +Version: 22.1 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: GNU Emacs Base Package -Source: emacs-22.0.99.tar.bz2 +Source: emacs-22.1.tar.bz2 Source1: app-defaults.Emacs Source2: site-lisp.tar.bz2 Source3: dot.gnu-emacs @@ -42,7 +42,7 @@ Patch10: emacs-22.0.99-sentinel.patch Patch11: emacs-22.0.99-xim.patch Patch12: emacs-22.0.99-x11r7.patch Patch13: emacs-22.0.99-s390x.dif -Patch14: emacs-22.0.99-conf.diff +Patch14: emacs-22.1-conf.diff %{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} @@ -386,6 +386,9 @@ unelc %{buildroot}/usr/share/emacs/site-lisp/site-start.elc unelc %{buildroot}/usr/share/emacs/site-lisp/subdirs.elc find %{buildroot}/usr/share/emacs/%{version}/etc/ -name '*[a-z].[16]' | \ xargs gzip -9f +rm -vf %{buildroot}/usr/share/emacs/%{version}/lisp/COPYING +ln -sf ../etc/COPYING \ + %{buildroot}/usr/share/emacs/%{version}/lisp/COPYING ## # install desktop file %suse_update_desktop_file -i emacs TextEditor @@ -458,7 +461,7 @@ done %doc /usr/share/emacs/%{version}/etc/DEBUG %doc /usr/share/emacs/%{version}/etc/DEVEL.HUMOR %doc /usr/share/emacs/%{version}/etc/DISTRIB -/usr/share/emacs/%{version}/etc/DOC-22.0.99.1 +/usr/share/emacs/%{version}/etc/DOC-%{version}.1 %doc /usr/share/emacs/%{version}/etc/ERC-NEWS %doc /usr/share/emacs/%{version}/etc/ETAGS.EBNF %doc /usr/share/emacs/%{version}/etc/ETAGS.README @@ -535,6 +538,7 @@ done %doc /usr/share/emacs/%{version}/etc/emacs.bash %doc /usr/share/emacs/%{version}/etc/emacs.csh /usr/share/emacs/%{version}/etc/emacs.icon +/usr/share/emacs/%{version}/etc/emacs.py %doc /usr/share/emacs/%{version}/etc/emacsclient.1.gz %doc /usr/share/emacs/%{version}/etc/emacstool.1.gz %doc /usr/share/emacs/%{version}/etc/enriched.doc @@ -544,7 +548,6 @@ done %doc /usr/share/emacs/%{version}/etc/fr-refcard.tex %doc /usr/share/emacs/%{version}/etc/fr-survival.tex %doc /usr/share/emacs/%{version}/etc/future-bug -%doc /usr/share/emacs/%{version}/etc/gfdl.1.gz %doc /usr/share/emacs/%{version}/etc/gnus-booklet.ps %doc /usr/share/emacs/%{version}/etc/gnus-logo.eps %doc /usr/share/emacs/%{version}/etc/gnus-refcard.ps @@ -1009,7 +1012,6 @@ done /usr/share/emacs/%{version}/lisp/button.elc %dir /usr/share/emacs/%{version}/lisp/calc/ %doc /usr/share/emacs/%{version}/lisp/calc/README -%doc /usr/share/emacs/%{version}/lisp/calc/README.prev /usr/share/emacs/%{version}/lisp/calc/calc-aent.elc /usr/share/emacs/%{version}/lisp/calc/calc-alg.elc /usr/share/emacs/%{version}/lisp/calc/calc-arith.elc @@ -1840,6 +1842,7 @@ done /usr/share/emacs/%{version}/lisp/progmodes/perl-mode.elc /usr/share/emacs/%{version}/lisp/progmodes/prolog.elc /usr/share/emacs/%{version}/lisp/progmodes/ps-mode.elc +/usr/share/emacs/%{version}/lisp/progmodes/python.elc /usr/share/emacs/%{version}/lisp/progmodes/scheme.elc /usr/share/emacs/%{version}/lisp/progmodes/sh-script.elc /usr/share/emacs/%{version}/lisp/progmodes/simula.elc @@ -2995,6 +2998,7 @@ done /usr/share/emacs/%{version}/lisp/progmodes/perl-mode.el.gz /usr/share/emacs/%{version}/lisp/progmodes/prolog.el.gz /usr/share/emacs/%{version}/lisp/progmodes/ps-mode.el.gz +/usr/share/emacs/%{version}/lisp/progmodes/python.el.gz /usr/share/emacs/%{version}/lisp/progmodes/scheme.el.gz /usr/share/emacs/%{version}/lisp/progmodes/sh-script.el.gz /usr/share/emacs/%{version}/lisp/progmodes/simula.el.gz @@ -3170,6 +3174,10 @@ done /usr/share/emacs/%{version}/lisp/xt-mouse.el.gz %changelog +* Mon Jun 04 2007 - werner@suse.de +- Update ot final emacs version 22.1 +* Mon Jun 04 2007 - werner@suse.de +- Make UTF-8 default if request within X window text selections * Fri Jun 01 2007 - dmueller@suse.de - fix buildrequires * Fri May 25 2007 - schwab@suse.de