Hello community,
here is the log from the commit of package emacs
checked in at Wed Apr 2 22:43:09 CEST 2008.
--------
--- emacs/emacs.changes 2008-01-04 16:36:37.000000000 +0100
+++ emacs/emacs.changes 2008-03-31 13:08:49.472216000 +0200
@@ -1,0 +2,68 @@
+Mon Mar 31 13:08:37 CEST 2008 - werner@suse.de
+
+- Update to emacs version 22.1
+ * Relicense all FSF files to GPLv3 or later.
+ * COPYING, info/COPYING: Switch to GPLv3.
+ * `describe-project' is renamed to `describe-gnu-project'.
+ * `view-todo' is renamed to `view-emacs-todo'.
+ * `find-name-dired' now uses -iname rather than -name
+ for case-insensitive filesystems.
+ * In Image mode, whenever the displayed image is wider and/or higher
+ than the window, the usual keys for moving the cursor cause the image
+ to be scrolled horizontally or vertically instead.
+ * Emacs can use stock icons in the tool bar when compiled with Gtk+.
+ However, this feature is disabled by default. To enable it, put
+ (setq icon-map-list '(x-gtk-stock-map))
+ in your .emacs or some other startup file. For more information, see
+ the documentation for the two variables icon-map-list and x-gtk-stock-map.
+ * Scrollbars follow the system theme on Windows XP and later.
+ Windows XP introduced themed scrollbars, but applications have to take
+ special steps to use them. Emacs now has the appropriate resources linked
+ in to make it use the scrollbars from the system theme.
+ * `bad-packages-alist' will warn about external packages that are known
+ to cause problems in this version of Emacs.
+ * The values of `dired-recursive-deletes' and `dired-recursive-copies'
+ have been changed to `top'. This means that the user is asked once,
+ before deleting/copying the indicated directory recursively.
+ * `browse-url-emacs' loads a URL into an Emacs buffer. Handy for *.el URLs.
+ * The command gdba has been removed as gdb works now for those cases where it
+ was needed. In text command mode, if you have problems before execution has
+ started, use M-x gud-gdb.
+ * desktop.el now detects conflicting uses of the desktop file.
+ * Compilation mode now correctly respects the value of
+ `compilation-scroll-output' between invocations.
+ * `font-lock-comment-face' no longer differs from the default on
+ displays with fewer than 16 colors and dark background (e.g. older
+ xterms and the Linux console).
+ * New Modes and Packages in Emacs 22.2
+ - bibtex-style-mode helps you write BibTeX's *.bst files.
+ - The new package css-mode.el provides a major mode for editing CSS files.
+ - The new package vera-mode.el provides a major mode for editing Vera files.
+ - The new package verilog-mode.el provides a major mode for editing Verilog files.
+ - The new package socks.el implements the SOCKS v5 protocol.
+ * VC
+ - VC backends can provide completion of revision names.
+ - VC backends can provide extra menu entries to the "Version Control" menu.
+ - VC has some support for Mercurial (Hg).
+ - VC has some support for Monotone (Mtn).
+ - VC has some support for Bazaar (Bzr).
+ - VC has some support for Git.
+ * Incompatible Lisp Changes in Emacs 22.2
+ - shell.el no longer defines the aliases `dirtrack-toggle' and
+ `dirtrack-mode' for `shell-dirtrack-mode'.
+ * Lisp Changes in Emacs 22.2.
+ - Frame-local variables are deprecated and are slated for removal.
+ - The function invisible-p returns non-nil if the character
+ after a specified position is invisible.
+ - inhibit-modification-hooks is bound to t while running modification hooks.
+ - New function `window-full-width-p' returns t if a window is as wide
+ as its frame.
+ - The new function `image-refresh' refreshes all images associated
+ with a given image specification.
+ - The new function `combine-and-quote-strings' concatenates a list of strings
+ using a specified separator.
+ - The new function `split-string-and-unquote' performs the inverse operation to
+ `combine-and-quote-strings', i.e. splits a single string into a list
+ of strings, undoing any quoting added by `combine-and-quote-strings'.
+
+-------------------------------------------------------------------
Old:
----
emacs-22.0.99.dif
emacs-22.1-CVE-2007-5795.dif
emacs-22.1-format.diff
emacs-22.1-iconic.patch
emacs-22.1.tar.bz2
New:
----
emacs-22.2.dif
emacs-22.2-iconic.patch
emacs-22.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
--- /var/tmp/diff_new_pack.L29104/_old 2008-04-02 22:42:23.000000000 +0200
+++ /var/tmp/diff_new_pack.L29104/_new 2008-04-02 22:42:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package emacs (Version 22.1)
+# spec file for package emacs (Version 22.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: emacs
BuildRequires: alsa-devel bind-devel fonts-config giflib-devel gtk2-devel krb5-devel libjpeg-devel libpng-devel libtiff-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel
Url: http://www.gnu.org/software/emacs/
@@ -19,17 +20,16 @@
Requires: emacs-info ctags emacs_program
Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc
AutoReqProv: on
-Version: 22.1
-Release: 77
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Version: 22.2
+Release: 1
Summary: GNU Emacs Base Package
-Source: emacs-22.1.tar.bz2
+Source: emacs-22.2.tar.bz2
Source1: app-defaults.Emacs
Source2: site-lisp.tar.bz2
Source3: dot.gnu-emacs
Source4: emacs-rpmlintrc
Source5: emacs.desktop
-Patch: emacs-22.0.99.dif
+Patch: emacs-22.2.dif
Patch1: emacs-22.0.99-linkscr.patch
Patch2: emacs-22.0.99-glibc.patch
Patch3: emacs-22.0.99-decl.dif
@@ -44,9 +44,8 @@
Patch12: emacs-22.0.99-x11r7.patch
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
+Patch15: emacs-22.2-iconic.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{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}
@@ -61,6 +60,7 @@
%define _x11inc %{_includedir}
%define appDefaultsFile %{_x11data}/app-defaults/Emacs
%endif
+%define info_files eintr elisp emacs ccmode cl dired-x ediff forms gnus message sieve pgg emacs-mime info mh-e reftex sc vip viper widget efaq ada-mode autotype calc idlwave eudc ebrowse pcl-cvs woman eshell org url speedbar tramp ses smtpmail flymake newsticker rcirc erc
%description
Basic package for the GNU Emacs editor. Requires emacs-x11 or
@@ -83,6 +83,7 @@
Ken Stevens
%package -n emacs-nox
+License: GPL v2 or later
PreReq: fileutils
Requires: emacs
Provides: emacs_program
@@ -114,6 +115,7 @@
Ken Stevens
%package -n emacs-x11
+License: GPL v2 or later
PreReq: fileutils
Requires: emacs
Enhances: xorg-x11-libs
@@ -146,6 +148,7 @@
Ken Stevens
%package -n emacs-el
+License: GPL v2 or later
Obsoletes: ge_lisp
Requires: emacs
Summary: Several Lisp Files for GNU Emacs
@@ -172,6 +175,7 @@
Eric S. Raymond
%package -n emacs-info
+License: GPL v2 or later
Obsoletes: ge_info elispman elisp-manual elispint emacs-lisp-intro
Provides: elispman elisp-manual elispint emacs-lisp-intro
Summary: Info files for GNU Emacs
@@ -215,17 +219,30 @@
%patch12 -p0 -b .x11r7
%patch13 -p0 -b .s390x
%patch14 -p0 -b .conf
-%patch15 -p0 -b .CVE20075795
-%patch16 -p0 -b .format
-%patch17 -p0 -b .iconic
+%patch15 -p0 -b .iconic
%patch
if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
install-mh -auto < /dev/null
fi
%build
-%define info_files eintr elisp emacs ccmode cl dired-x ediff forms gnus message sieve pgg emacs-mime info mh-e reftex sc vip viper widget efaq ada-mode autotype calc idlwave eudc ebrowse pcl-cvs woman eshell org url speedbar tramp ses smtpmail flymake newsticker rcirc erc
-if test "eintr elisp $(perl -e 'while (<>) { if (/^INFO_TARGETS/) { s/.*=//; while (s/\\$//) { $_ .= <>; }; s,\.\./info/,,g; s/\s+/ /g; s/^ //; s/ $//; print; exit; } }' man/Makefile.in)" != "%info_files"; then
+cflags ()
+{
+ local flag=$1; shift
+ case "${RPM_OPT_FLAGS}" in
+ *${flag}*) return
+ esac
+ if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
+ local var=$1; shift
+ eval $var=\${$var:+\$$var\ }$flag
+ fi
+ if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
+ local var=$1; shift
+ eval $var=\${$var:+\$$var\ }$flag
+ fi
+}
+if test "eintr elisp $(sed -rn '/^INFO_TARGET/{s@.*=\s*@@; :j; s@\.\./info/@@g; /\\$/{N; s@\\\n\s*@@; b j;}; p;}' man/Makefile.in)" != "%info_files"
+then
echo Please update info_files >&2
exit 1
fi
@@ -237,12 +254,14 @@
SYS="--build=%{_target_cpu}-suse-%{_build_os}
"
%endif
- CFLAGS="${RPM_OPT_FLAGS} -pipe -fno-strict-aliasing \
- -D_GNU_SOURCE \
- -Wno-pointer-sign \
- -Wno-unused-variable \
- -Wno-unused-label \
-"
+ CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE"
+ cflags -std=gnu89 CFLAGS
+ cflags -pipe CFLAGS
+ cflags -fno-strict-aliasing CFLAGS
+ cflags -Wno-pointer-sign CFLAGS
+ cflags -Wno-unused-variable CFLAGS
+ cflags -Wno-unused-label CFLAGS
+ cflags -Wno-unprototyped-calls CFLAGS
SMALL="-DSYSTEM_PURESIZE_EXTRA=25000 \
-DSITELOAD_PURESIZE_EXTRA=10000 \
"
@@ -292,47 +311,38 @@
--with-system-malloc \
"
%{?suse_update_config}
-malloc_chk_off ()
+make_mchkoff ()
{
local ret
local OMC=$MALLOC_CHECK_
unset MALLOC_CHECK_
- ${1+"$@"}
- ret=$?
+ make ${1+"$@"}
+ set -- $(src/emacs -batch --eval "(print pure-space-overflow)")
+ test "$1" = "nil" || exit 1
+ make -C src/ versionclean
+ make
if test -n "$OMC" ; then
MALLOC_CHECK_=$OMC
export MALLOC_CHECK_
fi
- return $ret
}
autoconf
CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
-malloc_chk_off make bootstrap
-set -- $(src/emacs -batch --eval "(print pure-space-overflow)")
-test "$1" = "nil" || exit 1
-#
+make_mchkoff bootstrap
make -C lisp updates compile
for i in `find site-lisp/ -name '*.el'`; do
src/emacs -batch -q --no-site -f batch-byte-compile $i; \
done
-rm -f src/emacs src/emacs-%{version}*
-make
cp src/emacs emacs-nox
make distclean
#
CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${GTK} ${SYS}
-malloc_chk_off make bootfast
-set -- $(src/emacs -batch --eval "(print pure-space-overflow)")
-test "$1" = "nil" || exit 1
-#
+make_mchkoff bootfast
cp src/emacs emacs-gtk
make distclean
#
CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${X11} ${SYS}
-malloc_chk_off make bootfast
-set -- $(src/emacs -batch --eval "(print pure-space-overflow)")
-test "$1" = "nil" || exit 1
-#
+make_mchkoff bootfast
cp src/emacs emacs-x11
#
cd ../site-lisp/
@@ -710,6 +720,7 @@
/usr/share/emacs/%{version}/etc/images/gnus/kill-group.xpm
/usr/share/emacs/%{version}/etc/images/gnus/mail-reply.pbm
/usr/share/emacs/%{version}/etc/images/gnus/mail-reply.xpm
+/usr/share/emacs/%{version}/etc/images/gnus/mail-send.xpm
/usr/share/emacs/%{version}/etc/images/gnus/next-ur.pbm
/usr/share/emacs/%{version}/etc/images/gnus/next-ur.xpm
/usr/share/emacs/%{version}/etc/images/gnus/post.pbm
@@ -1217,6 +1228,7 @@
/usr/share/emacs/%{version}/lisp/emacs-lisp/cl-compat.elc
/usr/share/emacs/%{version}/lisp/emacs-lisp/cl-extra.elc
/usr/share/emacs/%{version}/lisp/emacs-lisp/cl-indent.elc
+/usr/share/emacs/%{version}/lisp/emacs-lisp/cl-loaddefs.el
/usr/share/emacs/%{version}/lisp/emacs-lisp/cl-macs.elc
/usr/share/emacs/%{version}/lisp/emacs-lisp/cl-seq.elc
/usr/share/emacs/%{version}/lisp/emacs-lisp/cl-specs.el
@@ -1317,7 +1329,6 @@
/usr/share/emacs/%{version}/lisp/erc/erc-menu.elc
/usr/share/emacs/%{version}/lisp/erc/erc-netsplit.elc
/usr/share/emacs/%{version}/lisp/erc/erc-networks.elc
-/usr/share/emacs/%{version}/lisp/erc/erc-nicklist.elc
/usr/share/emacs/%{version}/lisp/erc/erc-notify.elc
/usr/share/emacs/%{version}/lisp/erc/erc-page.elc
/usr/share/emacs/%{version}/lisp/erc/erc-pcomplete.elc
@@ -1748,6 +1759,7 @@
/usr/share/emacs/%{version}/lisp/net/rcompile.elc
/usr/share/emacs/%{version}/lisp/net/rlogin.elc
/usr/share/emacs/%{version}/lisp/net/snmp-mode.elc
+/usr/share/emacs/%{version}/lisp/net/socks.elc
/usr/share/emacs/%{version}/lisp/net/telnet.elc
/usr/share/emacs/%{version}/lisp/net/tls.elc
/usr/share/emacs/%{version}/lisp/net/tramp-ftp.elc
@@ -1916,6 +1928,8 @@
/usr/share/emacs/%{version}/lisp/progmodes/simula.elc
/usr/share/emacs/%{version}/lisp/progmodes/sql.elc
/usr/share/emacs/%{version}/lisp/progmodes/tcl.elc
+/usr/share/emacs/%{version}/lisp/progmodes/vera-mode.elc
+/usr/share/emacs/%{version}/lisp/progmodes/verilog-mode.elc
/usr/share/emacs/%{version}/lisp/progmodes/vhdl-mode.elc
/usr/share/emacs/%{version}/lisp/progmodes/which-func.elc
/usr/share/emacs/%{version}/lisp/progmodes/xscheme.elc
@@ -2001,7 +2015,9 @@
/usr/share/emacs/%{version}/lisp/textmodes/artist.elc
/usr/share/emacs/%{version}/lisp/textmodes/bib-mode.elc
/usr/share/emacs/%{version}/lisp/textmodes/bibtex.elc
+/usr/share/emacs/%{version}/lisp/textmodes/bibtex-style.elc
/usr/share/emacs/%{version}/lisp/textmodes/conf-mode.elc
+/usr/share/emacs/%{version}/lisp/textmodes/css-mode.elc
/usr/share/emacs/%{version}/lisp/textmodes/dns-mode.elc
/usr/share/emacs/%{version}/lisp/textmodes/enriched.elc
/usr/share/emacs/%{version}/lisp/textmodes/fill.elc
@@ -2085,9 +2101,13 @@
/usr/share/emacs/%{version}/lisp/url/vc-dav.elc
/usr/share/emacs/%{version}/lisp/userlock.elc
/usr/share/emacs/%{version}/lisp/vc-arch.elc
+/usr/share/emacs/%{version}/lisp/vc-bzr.elc
/usr/share/emacs/%{version}/lisp/vc-cvs.elc
+/usr/share/emacs/%{version}/lisp/vc-git.elc
+/usr/share/emacs/%{version}/lisp/vc-hg.elc
/usr/share/emacs/%{version}/lisp/vc-hooks.elc
/usr/share/emacs/%{version}/lisp/vc-mcvs.elc
+/usr/share/emacs/%{version}/lisp/vc-mtn.elc
/usr/share/emacs/%{version}/lisp/vc-rcs.elc
/usr/share/emacs/%{version}/lisp/vc-sccs.elc
/usr/share/emacs/%{version}/lisp/vc-svn.elc
@@ -2529,7 +2549,6 @@
/usr/share/emacs/%{version}/lisp/erc/erc-menu.el.gz
/usr/share/emacs/%{version}/lisp/erc/erc-netsplit.el.gz
/usr/share/emacs/%{version}/lisp/erc/erc-networks.el.gz
-/usr/share/emacs/%{version}/lisp/erc/erc-nicklist.el.gz
/usr/share/emacs/%{version}/lisp/erc/erc-notify.el.gz
/usr/share/emacs/%{version}/lisp/erc/erc-page.el.gz
/usr/share/emacs/%{version}/lisp/erc/erc-pcomplete.el.gz
@@ -2913,6 +2932,7 @@
/usr/share/emacs/%{version}/lisp/net/rcompile.el.gz
/usr/share/emacs/%{version}/lisp/net/rlogin.el.gz
/usr/share/emacs/%{version}/lisp/net/snmp-mode.el.gz
+/usr/share/emacs/%{version}/lisp/net/socks.el.gz
/usr/share/emacs/%{version}/lisp/net/telnet.el.gz
/usr/share/emacs/%{version}/lisp/net/tls.el.gz
/usr/share/emacs/%{version}/lisp/net/tramp-ftp.el.gz
@@ -3074,6 +3094,8 @@
/usr/share/emacs/%{version}/lisp/progmodes/simula.el.gz
/usr/share/emacs/%{version}/lisp/progmodes/sql.el.gz
/usr/share/emacs/%{version}/lisp/progmodes/tcl.el.gz
+/usr/share/emacs/%{version}/lisp/progmodes/vera-mode.el.gz
+/usr/share/emacs/%{version}/lisp/progmodes/verilog-mode.el.gz
/usr/share/emacs/%{version}/lisp/progmodes/vhdl-mode.el.gz
/usr/share/emacs/%{version}/lisp/progmodes/which-func.el.gz
/usr/share/emacs/%{version}/lisp/progmodes/xscheme.el.gz
@@ -3132,7 +3154,9 @@
/usr/share/emacs/%{version}/lisp/textmodes/artist.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/bib-mode.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/bibtex.el.gz
+/usr/share/emacs/%{version}/lisp/textmodes/bibtex-style.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/conf-mode.el.gz
+/usr/share/emacs/%{version}/lisp/textmodes/css-mode.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/dns-mode.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/enriched.el.gz
/usr/share/emacs/%{version}/lisp/textmodes/fill.el.gz
@@ -3215,9 +3239,13 @@
/usr/share/emacs/%{version}/lisp/url/vc-dav.el.gz
/usr/share/emacs/%{version}/lisp/userlock.el.gz
/usr/share/emacs/%{version}/lisp/vc-arch.el.gz
+/usr/share/emacs/%{version}/lisp/vc-bzr.el.gz
/usr/share/emacs/%{version}/lisp/vc-cvs.el.gz
+/usr/share/emacs/%{version}/lisp/vc-git.el.gz
+/usr/share/emacs/%{version}/lisp/vc-hg.el.gz
/usr/share/emacs/%{version}/lisp/vc-hooks.el.gz
/usr/share/emacs/%{version}/lisp/vc-mcvs.el.gz
+/usr/share/emacs/%{version}/lisp/vc-mtn.el.gz
/usr/share/emacs/%{version}/lisp/vc-rcs.el.gz
/usr/share/emacs/%{version}/lisp/vc-sccs.el.gz
/usr/share/emacs/%{version}/lisp/vc-svn.el.gz
++++++ emacs-22.0.99.dif -> emacs-22.2.dif ++++++
--- emacs/emacs-22.0.99.dif 2007-11-22 16:32:48.000000000 +0100
+++ emacs/emacs-22.2.dif 2008-03-31 12:47:15.897801000 +0200
@@ -1,22 +1,24 @@
--- .pkgextract
-+++ .pkgextract 2007-05-15 18:47:54.250121000 +0200
-@@ -0,0 +1,13 @@
-+patch -s -p0 --suffix=.axp < ../emacs-22.0.99-linkscr.patch
-+patch -s -p0 --suffix=.glibc < ../emacs-22.0.99-glibc.patch
-+patch -s -p0 --suffix=.decl < ../emacs-22.0.99-decl.dif
-+patch -s -p0 --suffix=.print < ../emacs-21.1-asian-print.patch
-+patch -s -p0 --suffix=.psbdf < ../emacs-22.0.99-ps-bdf.patch
-+patch -s -p0 --suffix=.ppc64 < ../emacs-22.0.99-ppc64.patch
-+patch -s -p0 --suffix=.psmu < ../emacs-22.0.99-ps-mule.patch
-+patch -s -p0 --suffix=.nvoid < ../emacs-22.0.99-nonvoid.patch
-+patch -s -p0 --suffix=.snd < ../emacs-22.0.99-sendmail-path.patch
-+patch -s -p0 --suffix=.gcc4 < ../emacs-22.0.99-sentinel.patch
-+patch -s -p0 --suffix=.xim < ../emacs-22.0.99-xim.patch
-+patch -s -p0 --suffix=.x11r7 < ../emacs-22.0.99-x11r7.patch
-+patch -s -p0 --suffix=.s390x < ../emacs-22.0.99-s390x.dif
++++ .pkgextract 2008-03-31 12:47:06.572601686 +0200
+@@ -0,0 +1,15 @@
++patch -s -p0 -b --suffix=.axp < ../emacs-22.0.99-linkscr.patch
++patch -s -p0 -b --suffix=.glibc < ../emacs-22.0.99-glibc.patch
++patch -s -p0 -b --suffix=.decl < ../emacs-22.0.99-decl.dif
++patch -s -p0 -b --suffix=.print < ../emacs-21.1-asian-print.patch
++patch -s -p0 -b --suffix=.psbdf < ../emacs-22.0.99-ps-bdf.patch
++patch -s -p0 -b --suffix=.ppc64 < ../emacs-22.0.99-ppc64.patch
++patch -s -p0 -b --suffix=.psmu < ../emacs-22.0.99-ps-mule.patch
++patch -s -p0 -b --suffix=.nvoid < ../emacs-22.0.99-nonvoid.patch
++patch -s -p0 -b --suffix=.snd < ../emacs-22.0.99-sendmail-path.patch
++patch -s -p0 -b --suffix=.gcc4 < ../emacs-22.0.99-sentinel.patch
++patch -s -p0 -b --suffix=.xim < ../emacs-22.0.99-xim.patch
++patch -s -p0 -b --suffix=.x11r7 < ../emacs-22.0.99-x11r7.patch
++patch -s -p0 -b --suffix=.s390x < ../emacs-22.0.99-s390x.dif
++patch -s -p0 -b --suffix=.conf < ../emacs-22.1-conf.diff
++patch -s -p0 -b --suffix=.iconic < ../emacs-22.2-iconic.patch
--- Makefile.in
-+++ Makefile.in 2007-05-16 11:50:24.711789000 +0200
-@@ -384,10 +384,8 @@ install-arch-dep: mkdir
++++ Makefile.in 2007-05-16 11:50:25.000000000 +0200
+@@ -385,10 +385,8 @@ install-arch-dep: mkdir
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
@@ -29,7 +31,7 @@
-unset CDPATH; \
for f in `cd lib-src && echo fns-*.el`; do \
if test -r lib-src/$$f ; then \
-@@ -525,15 +523,19 @@ install-arch-indep: mkdir info
+@@ -526,15 +524,19 @@ install-arch-indep: mkdir info
for elt in $(INFO_FILES); do \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
@@ -50,7 +52,7 @@
done
### Install LEIM files. Although they are machine-independent, we
-@@ -595,8 +597,8 @@ uninstall:
+@@ -596,8 +598,8 @@ uninstall:
rm -f $$f; \
done; \
done;)
@@ -62,8 +64,8 @@
FRC:
--- configure.in
-+++ configure.in 2007-05-15 18:49:52.630666000 +0200
-@@ -363,11 +363,11 @@ dnl see the `changequote' comment above.
++++ configure.in 2008-03-31 12:43:19.387363991 +0200
+@@ -377,11 +377,11 @@ dnl see the `changequote' comment above.
esac
;;
@@ -77,7 +79,7 @@
machine=arm opsys=gnu-linux
;;
-@@ -646,7 +646,7 @@ dnl see the `changequote' comment above.
+@@ -660,7 +660,7 @@ dnl see the `changequote' comment above.
CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
;;
@@ -86,7 +88,7 @@
machine=hp800 opsys=gnu-linux
;;
-@@ -666,6 +666,11 @@ dnl see the `changequote' comment above.
+@@ -680,6 +680,11 @@ dnl see the `changequote' comment above.
machine=hp800 opsys=nextstep
;;
@@ -98,7 +100,7 @@
## Orion machines
orion-orion-bsd* )
machine=orion opsys=bsd4-2
-@@ -684,10 +689,10 @@ dnl see the `changequote' comment above.
+@@ -698,10 +703,10 @@ dnl see the `changequote' comment above.
i370-ibm-aix*)
machine=ibm370aix opsys=usg5-3
;;
@@ -111,7 +113,7 @@
machine=ibms390x opsys=gnu-linux
;;
rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1* )
-@@ -970,7 +975,7 @@ dnl see the `changequote' comment above.
+@@ -984,7 +989,7 @@ dnl see the `changequote' comment above.
;;
## Suns
@@ -120,7 +122,7 @@
machine=sparc opsys=gnu-linux
;;
-@@ -1152,7 +1157,7 @@ dnl see the `changequote' comment above.
+@@ -1166,7 +1171,7 @@ dnl see the `changequote' comment above.
*-esix5* ) opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;;
*-esix* ) opsys=esix ;;
*-xenix* ) opsys=xenix ;;
@@ -129,7 +131,7 @@
*-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;;
*-sco3.2v5* ) opsys=sco5
NON_GNU_CPP=/lib/cpp
-@@ -1170,12 +1175,12 @@ dnl see the `changequote' comment above.
+@@ -1184,12 +1189,12 @@ dnl see the `changequote' comment above.
;;
## m68k Linux-based GNU system
@@ -144,7 +146,7 @@
machine=mips opsys=gnu-linux
;;
-@@ -1192,12 +1197,12 @@ dnl see the `changequote' comment above.
+@@ -1206,7 +1211,7 @@ dnl see the `changequote' comment above.
;;
## AMD x86-64 Linux-based GNU system
@@ -153,13 +155,7 @@
machine=amdx86-64 opsys=gnu-linux
;;
- ## Tensilica Xtensa Linux-based GNU system
-- xtensa-*-linux-gnu* )
-+ xtensa-*-linux* )
- machine=xtensa opsys=gnu-linux
- ;;
-
-@@ -1214,7 +1219,7 @@ esac
+@@ -1228,7 +1233,7 @@ esac
### above.
if test x"${opsys}" = x; then
case "${canonical}" in
@@ -168,17 +164,17 @@
*-bsd4.[01] ) opsys=bsd4-1 ;;
*-bsd4.2 ) opsys=bsd4-2 ;;
*-bsd4.3 ) opsys=bsd4-3 ;;
-@@ -1520,7 +1525,7 @@ AC_SYS_LARGEFILE
+@@ -1558,7 +1563,7 @@ AC_SYS_LARGEFILE
### The standard library on x86-64 GNU/Linux distributions can
### be located in either /usr/lib64 or /usr/lib.
case "${canonical}" in
-- x86_64-*-linux-gnu* )
-+ x86_64-*-linux* )
+- x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
++ x86_64-*-linux* | s390x-*-linux* )
if test -d /usr/lib64; then
AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
[Define to 1 if the file /usr/lib64 exists.])
--- etc/MACHINES
-+++ etc/MACHINES 2007-05-15 18:50:36.035268000 +0200
++++ etc/MACHINES 2007-05-15 18:50:36.000000000 +0200
@@ -74,7 +74,7 @@ Alliant FX/2800 (i860-alliant-bsd)
Known to work with 19.26 and OS version 2.2, compiler version 1.3.
@@ -234,7 +230,7 @@
(using the location of the 32-bit X libraries on your system).
--- etc/etags.1
-+++ etc/etags.1 2007-05-15 18:52:17.870077000 +0200
++++ etc/etags.1 2007-05-15 18:52:18.000000000 +0200
@@ -9,7 +9,7 @@
..
@@ -270,7 +266,7 @@
+\fBgnuctags\fP) in the current working directory.
Files specified with relative file names will be recorded in the tag
table with file names relative to the directory where the tag table
- resides. If the tag table is in /dev, however, the file names are made
+ resides. If the tag table is in /dev or is the standard output,
@@ -71,7 +71,7 @@ parsing of the file names following the
language, overriding guesses based on filename extensions.
.SH OPTIONS
@@ -318,16 +314,7 @@
\fBetags\fP accepts this option.
.TP
\fB\-i\fP \fIfile\fP, \fB\-\-include=\fIfile\fP
-@@ -138,7 +138,7 @@ Create tag entries for variables that ar
- constructs in C++, Objective C, Java. This is the default for etags.
- .TP
- .B \-\-no\-members
--Do not tag member variables. This is the default for ctags.
-+Do not tag member variables. This is the default for gnuctags.
- .TP
- .B \-\-packages\-only
- Only tag packages in Ada files.
-@@ -168,7 +168,7 @@ the previous ones. The regexps are of o
+@@ -169,7 +169,7 @@ the previous ones. The regexps are of o
where \fItagregexp\fP is used to match the tag. It should not match
useless characters. If the match is such that more characters than
needed are unavoidably matched by \fItagregexp\fP, it may be useful to
@@ -336,7 +323,7 @@
ignores regexps without a \fInameregexp\fP. The syntax of regexps is
the same as in emacs. The following character escape sequences are
supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which
-@@ -243,12 +243,12 @@ freely intermixed with filenames and the
+@@ -244,12 +244,12 @@ freely intermixed with filenames and the
.TP
.B \-t, \-\-typedefs
Record typedefs in C code as tags. Since this is the default behavior
@@ -351,7 +338,7 @@
.TP
.B \-u, \-\-update
Update tag entries for \fIfiles\fP specified on command line, leaving
-@@ -256,15 +256,15 @@ tag entries for other files in place. C
+@@ -257,15 +257,15 @@ tag entries for other files in place. C
by deleting the existing entries for the given files and then
rewriting the new entries at the end of the tags file. It is often
faster to simply rebuild the entire tag file than to use this.
@@ -371,8 +358,8 @@
.B \-h, \-H, \-\-help
Print usage information. Followed by one or more \-\-language=LANG
--- leim/Makefile.in
-+++ leim/Makefile.in 2007-05-22 15:58:18.686951000 +0200
-@@ -216,6 +216,9 @@ leim-list.el: ${SUBDIRS} ${TIT-MISC} cha
++++ leim/Makefile.in 2007-05-22 15:58:19.000000000 +0200
+@@ -218,6 +218,9 @@ leim-list.el: ${SUBDIRS} ${TIT-MISC} cha
fi
sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
@@ -383,7 +370,7 @@
if [ ! -d ${INSTALLDIR} ] ; then \
${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
--- lib-src/Makefile.in
-+++ lib-src/Makefile.in 2007-05-15 18:54:25.327601000 +0200
++++ lib-src/Makefile.in 2007-05-15 18:54:25.000000000 +0200
@@ -106,7 +106,7 @@ INSTALL_STRIP =
# Things that a user might actually run,
@@ -393,7 +380,7 @@
INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
# Things that Emacs runs internally, or during the build process,
-@@ -427,8 +427,8 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(
+@@ -430,8 +430,8 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(
/* We depend on etags to assure that parallel makes don\'t write two
etags.o files on top of each other. */
@@ -466,7 +453,7 @@
(scheme-start-file (car cmdlist)) (cdr cmdlist)))
(inferior-scheme-mode)))
--- lisp/dired.el
-+++ lisp/dired.el 2007-05-15 18:55:29.522418000 +0200
++++ lisp/dired.el 2007-05-15 18:55:30.000000000 +0200
@@ -70,7 +70,7 @@ If nil, `dired-listing-switches' is used
;;;###autoload
@@ -477,7 +464,7 @@
(if (file-exists-p "/usr/sbin/chown")
"/usr/sbin/chown"
--- lisp/help.el
-+++ lisp/help.el 2007-05-15 18:57:08.520930000 +0200
++++ lisp/help.el 2007-05-15 18:57:09.000000000 +0200
@@ -38,6 +38,9 @@
(add-hook 'temp-buffer-setup-hook 'help-mode-setup)
(add-hook 'temp-buffer-show-hook 'help-mode-finish)
@@ -489,8 +476,8 @@
(let ((map (make-sparse-keymap)))
(define-key map (char-to-string help-char) 'help-for-help)
--- lisp/ldefs-boot.el
-+++ lisp/ldefs-boot.el 2007-05-15 18:58:09.723427000 +0200
-@@ -6862,7 +6862,7 @@ some of the `ls' switches are not suppor
++++ lisp/ldefs-boot.el 2007-05-15 18:58:10.000000000 +0200
+@@ -6874,7 +6874,7 @@ some of the `ls' switches are not suppor
(custom-autoload (quote dired-listing-switches) "dired" t)
@@ -602,7 +589,7 @@
(define-key mule-keymap "r" 'revert-buffer-with-coding-system)
(define-key mule-keymap "F" 'set-file-name-coding-system)
--- lisp/mh-e/mh-e.el
-+++ lisp/mh-e/mh-e.el 2007-05-21 14:27:40.379538854 +0200
++++ lisp/mh-e/mh-e.el 2007-05-21 14:27:40.000000000 +0200
@@ -143,6 +143,9 @@
"/usr/local/mh/"
"/usr/bin/mh/" ; Ultrix 4.2, Linux
@@ -639,7 +626,7 @@
--- lisp/net/ange-ftp.el
+++ lisp/net/ange-ftp.el 2003-07-23 18:08:56.000000000 +0200
-@@ -4873,7 +4873,7 @@ NEWNAME should be the name to give the n
+@@ -4878,7 +4878,7 @@ NEWNAME should be the name to give the n
; "If a host matches this regexp then it is assumed to be running VOS.")
;
;(defun ange-ftp-vos-host (host)
@@ -648,7 +635,7 @@
; (save-match-data
; (string-match ange-ftp-vos-host-regexp host))))
;
-@@ -4984,7 +4984,7 @@ NEWNAME should be the name to give the n
+@@ -4989,7 +4989,7 @@ NEWNAME should be the name to give the n
;; Return non-nil if HOST is running VMS.
(defun ange-ftp-vms-host (host)
@@ -657,7 +644,7 @@
(save-match-data
(string-match ange-ftp-vms-host-regexp host))))
-@@ -5493,7 +5493,7 @@ Other orders of $ and _ seem to all work
+@@ -5498,7 +5498,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running MTS.
(defun ange-ftp-mts-host (host)
@@ -666,7 +653,7 @@
(save-match-data
(string-match ange-ftp-mts-host-regexp host))))
-@@ -5692,7 +5692,7 @@ Other orders of $ and _ seem to all work
+@@ -5697,7 +5697,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running CMS.
(defun ange-ftp-cms-host (host)
@@ -703,7 +690,7 @@
(message "The uncompress package is obsolete; use M-x auto-compression-mode")
--- lisp/textmodes/ispell.el
-+++ lisp/textmodes/ispell.el 2007-05-22 10:48:36.408268131 +0200
++++ lisp/textmodes/ispell.el 2007-05-22 10:48:36.000000000 +0200
@@ -305,8 +305,11 @@ Must be greater than 1."
:group 'ispell)
@@ -718,7 +705,7 @@
"Program invoked by \\[ispell-word] and \\[ispell-region] commands."
:type 'string
:group 'ispell)
-@@ -519,7 +522,7 @@ re-start Emacs."
+@@ -524,7 +527,7 @@ re-start Emacs."
;;; First part of dictionary, shortened for loaddefs.el
;;;###autoload
@@ -727,7 +714,7 @@
ispell-dictionary-alist-1
'((nil ; default (English.aff)
"[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1)
-@@ -543,7 +546,7 @@ re-start Emacs."
+@@ -548,7 +551,7 @@ re-start Emacs."
;;; Second part of dictionary, shortened for loaddefs.el
;;;###autoload
@@ -736,7 +723,7 @@
ispell-dictionary-alist-2
'(("czech"
"[A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]"
-@@ -564,7 +567,7 @@ re-start Emacs."
+@@ -569,7 +572,7 @@ re-start Emacs."
;;; Third part of dictionary, shortened for loaddefs.el
;;;###autoload
@@ -745,7 +732,7 @@
ispell-dictionary-alist-3
'(("esperanto"
"[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]"
-@@ -587,7 +590,7 @@ re-start Emacs."
+@@ -592,7 +595,7 @@ re-start Emacs."
;;; Fourth part of dictionary, shortened for loaddefs.el
;;;###autoload
@@ -754,7 +741,7 @@
ispell-dictionary-alist-4
'(("german" ; german.aff
"[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1)
-@@ -611,7 +614,7 @@ re-start Emacs."
+@@ -616,7 +619,7 @@ re-start Emacs."
;;; Fifth part of dictionary, shortened for loaddefs.el
;;;###autoload
@@ -763,7 +750,7 @@
ispell-dictionary-alist-5
'(("norsk" ; 8 bit Norwegian mode
"[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]"
-@@ -632,7 +635,7 @@ re-start Emacs."
+@@ -637,7 +640,7 @@ re-start Emacs."
;;; Sixth part of dictionary, shortened for loaddefs.el
;;;###autoload
@@ -772,7 +759,7 @@
ispell-dictionary-alist-6
;; include Russian iso coding system too?
;; "[']" t ("-d" "russian") "~latin1" iso-8859-1
-@@ -1046,6 +1049,56 @@ The variable `ispell-library-directory'
+@@ -1051,6 +1054,56 @@ The variable `ispell-library-directory'
(if ispell-menu-map-needed
(progn
(setq ispell-menu-map (make-sparse-keymap "Spell"))
@@ -1146,7 +1133,7 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von linux.el
--- site-lisp/term/locale.el
-+++ site-lisp/term/locale.el 2007-06-04 15:26:38.703969552 +0200
++++ site-lisp/term/locale.el 2007-06-04 15:26:39.000000000 +0200
@@ -0,0 +1,16 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/locale.el for site-lisp path
@@ -1165,8 +1152,8 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von locale.el
--- src/Makefile.in
-+++ src/Makefile.in 2007-05-15 19:19:55.029819000 +0200
-@@ -710,6 +710,9 @@ otherobj= $(termcapobj) lastfile.o $(mal
++++ src/Makefile.in 2007-05-15 19:19:55.000000000 +0200
+@@ -711,6 +711,9 @@ otherobj= $(termcapobj) lastfile.o $(mal
#define TOOLTIP_SUPPORT
#endif
@@ -1176,7 +1163,7 @@
/* List of Lisp files loaded into the dumped Emacs. It is arranged
like this because it is easier to generate it semi-mechanically from
loadup.el this way.
-@@ -908,6 +911,7 @@ shortlisp= \
+@@ -909,6 +912,7 @@ shortlisp= \
../lisp/ediff-hook.elc \
../lisp/widget.elc \
../lisp/window.elc \
@@ -1185,7 +1172,7 @@
/* Lisp files that may or may not be used.
--- src/config.in
-+++ src/config.in 2007-05-15 19:25:17.876169000 +0200
++++ src/config.in 2007-05-15 19:25:18.000000000 +0200
@@ -911,6 +911,8 @@ Boston, MA 02110-1301, USA. */
code using `volatile' can become incorrect without. Disable with care. */
#undef volatile
@@ -1221,7 +1208,7 @@
--- src/keyboard.c
+++ src/keyboard.c 2003-07-23 18:08:56.000000000 +0200
-@@ -1395,7 +1395,7 @@ DEFUN ("abort-recursive-edit", Fabort_re
+@@ -1396,7 +1396,7 @@ DEFUN ("abort-recursive-edit", Fabort_re
/* Restore mouse tracking enablement. See Ftrack_mouse for the only use
of this function. */
@@ -1260,7 +1247,7 @@
exit (0);
}
--- src/m/hp800.h
-+++ src/m/hp800.h 2007-05-15 19:33:25.880021000 +0200
++++ src/m/hp800.h 2007-05-15 19:33:26.000000000 +0200
@@ -71,7 +71,7 @@ Boston, MA 02110-1301, USA. */
/* Common definitions for HPUX and GNU/Linux. */
++++++ emacs-22.1-iconic.patch -> emacs-22.2-iconic.patch ++++++
--- emacs/emacs-22.1-iconic.patch 2007-12-20 12:11:31.000000000 +0100
+++ emacs/emacs-22.2-iconic.patch 2008-03-31 12:24:03.106604000 +0200
@@ -1,12 +1,12 @@
--- lisp/startup.el
-+++ lisp/startup.el 2007-12-20 12:10:27.169138433 +0100
-@@ -1829,6 +1829,9 @@ With a prefix argument, any user input h
- ((equal argi "-no-splash")
- (setq inhibit-startup-message t))
++++ lisp/startup.el 2008-03-31 12:23:04.503065574 +0200
+@@ -1996,6 +1996,9 @@ A fancy display is used on graphic displ
+ ((equal argi "-no-splash")
+ (setq inhibit-startup-screen t))
-+ ((equal argi "-iconic")
-+ (setq inhibit-startup-message t))
++ ((equal argi "-iconic")
++ (setq inhibit-startup-message t))
+
- ((member argi '("-f" ; what the manual claims
- "-funcall"
- "-e")) ; what the source used to say
+ ((member argi '("-f" ; what the manual claims
+ "-funcall"
+ "-e")) ; what the source used to say
++++++ emacs-22.1.tar.bz2 -> emacs-22.2.tar.bz2 ++++++
emacs/emacs-22.1.tar.bz2 emacs/emacs-22.2.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org