From fc236ca9840e2f5c013dcf06f5d61dce4009889e5ad4c1cff482254c5323fc20 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 15 Apr 2011 18:13:17 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/emacs revision 64.0 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=dc9df81a17140c36a66ee54623905f20 --- emacs.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/emacs.spec b/emacs.spec index 2e235db..fafd5e8 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,7 +1,7 @@ # -# spec file for package emacs (Version 23.2) +# spec file for package emacs # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ Url: http://www.gnu.org/software/emacs/ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.2 -Release: 3 +Release: 10 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} From 248762ab131b377c25791ab57ffc8cc1091db285c7b1f535c69d42f965fcc215 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 11 Jul 2011 15:36:51 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=51 --- emacs-23.2-s390x.dif | 115 ------------------ emacs-23.2.tar.bz2 | 3 - emacs-23.2-gcc45.dif => emacs-23.3-gcc45.dif | 35 ++---- ....2-ps-bdf.patch => emacs-23.3-ps-bdf.patch | 4 +- emacs-23.3-s390x.dif | 24 ++++ emacs-23.2.dif => emacs-23.3.dif | 30 ++--- emacs-23.3.tar.bz2 | 3 + emacs.changes | 61 ++++++++++ emacs.spec | 49 +++++--- 9 files changed, 147 insertions(+), 177 deletions(-) delete mode 100644 emacs-23.2-s390x.dif delete mode 100644 emacs-23.2.tar.bz2 rename emacs-23.2-gcc45.dif => emacs-23.3-gcc45.dif (88%) rename emacs-23.2-ps-bdf.patch => emacs-23.3-ps-bdf.patch (94%) create mode 100644 emacs-23.3-s390x.dif rename emacs-23.2.dif => emacs-23.3.dif (98%) create mode 100644 emacs-23.3.tar.bz2 diff --git a/emacs-23.2-s390x.dif b/emacs-23.2-s390x.dif deleted file mode 100644 index 5951a2c..0000000 --- a/emacs-23.2-s390x.dif +++ /dev/null @@ -1,115 +0,0 @@ ---- src/lisp.h -+++ src/lisp.h 2010-10-18 13:46:05.240426350 +0000 -@@ -375,7 +375,7 @@ enum pvec_type - For example, if tem is a Lisp_Object whose type is Lisp_Cons, - XCONS (tem) is the struct Lisp_Cons * pointing to the memory for that cons. */ - --#ifndef USE_LISP_UNION_TYPE -+#if !defined(USE_LISP_UNION_TYPE) && !defined(__s390x__) - - /* Return a perfect hash of the Lisp_Object representation. */ - #define XHASH(a) (a) -@@ -385,19 +385,31 @@ enum pvec_type - #define TYPEMASK ((((EMACS_INT) 1) << GCTYPEBITS) - 1) - #define XTYPE(a) ((enum Lisp_Type) (((EMACS_UINT) (a)) & TYPEMASK)) - #ifdef USE_2_TAGS_FOR_INTS -+#ifndef XINT - # define XINT(a) (((EMACS_INT) (a)) >> (GCTYPEBITS - 1)) -+#endif -+#ifndef XUINT - # define XUINT(a) (((EMACS_UINT) (a)) >> (GCTYPEBITS - 1)) -+#endif - # define make_number(N) (((EMACS_INT) (N)) << (GCTYPEBITS - 1)) - #else -+#ifndef XINT - # define XINT(a) (((EMACS_INT) (a)) >> GCTYPEBITS) -+#endif -+#ifndef XUINT - # define XUINT(a) (((EMACS_UINT) (a)) >> GCTYPEBITS) -+#endif - # define make_number(N) (((EMACS_INT) (N)) << GCTYPEBITS) - #endif -+#ifndef XSET - #define XSET(var, type, ptr) \ - (eassert (XTYPE (ptr) == 0), /* Check alignment. */ \ - (var) = ((EMACS_INT) (type)) | ((EMACS_INT) (ptr))) -+#endif - -+#ifndef XPNTR - #define XPNTR(a) ((EMACS_INT) ((a) & ~TYPEMASK)) -+#endif - - #else /* not USE_LSB_TAG */ - -@@ -418,19 +430,29 @@ enum pvec_type - /* Extract the value of a Lisp_Object as a (un)signed integer. */ - - #ifdef USE_2_TAGS_FOR_INTS -+#ifndef XINT - # define XINT(a) ((((EMACS_INT) (a)) << (GCTYPEBITS - 1)) >> (GCTYPEBITS - 1)) -+#endif -+#ifndef XUINT - # define XUINT(a) ((EMACS_UINT) ((a) & (1 + (VALMASK << 1)))) -+#endif - # define make_number(N) ((((EMACS_INT) (N)) & (1 + (VALMASK << 1)))) - #else -+#ifndef XINT - # define XINT(a) ((((EMACS_INT) (a)) << (BITS_PER_EMACS_INT - VALBITS)) \ - >> (BITS_PER_EMACS_INT - VALBITS)) -+#endif -+#ifndef XUINT - # define XUINT(a) ((EMACS_UINT) ((a) & VALMASK)) -+#endif - # define make_number(N) \ - ((((EMACS_INT) (N)) & VALMASK) | ((EMACS_INT) Lisp_Int) << VALBITS) - #endif - -+#ifndef XSET - #define XSET(var, type, ptr) \ - ((var) = ((EMACS_INT)(type) << VALBITS) + ((EMACS_INT) (ptr) & VALMASK)) -+#endif - - #define XPNTR(a) ((EMACS_UINT) ((a) & VALMASK)) - -@@ -457,14 +479,18 @@ enum pvec_type - #define XINT(a) ((a).s.val) - #endif /* EXPLICIT_SIGN_EXTEND */ - -+#ifndef XUINT - #define XUINT(a) ((a).u.val) -+#endif - - #ifdef USE_LSB_TAG - -+#ifndef XSET - # define XSET(var, vartype, ptr) \ - (eassert ((((EMACS_UINT) (ptr)) & ((1 << GCTYPEBITS) - 1)) == 0), \ - (var).u.val = ((EMACS_UINT) (ptr)) >> GCTYPEBITS, \ - (var).u.type = ((char) (vartype))) -+#endif - - /* Some versions of gcc seem to consider the bitfield width when issuing - the "cast to pointer from integer of different size" warning, so the -@@ -479,8 +505,10 @@ enum pvec_type - # define XFASTINT(a) ((a).i + 0) - # define XSETFASTINT(a, b) ((a).i = (b)) - -+#ifndef XSET - # define XSET(var, vartype, ptr) \ - (((var).s.val = ((EMACS_INT) (ptr))), ((var).s.type = ((char) (vartype)))) -+#endif - - #endif /* !USE_LSB_TAG */ - ---- src/m/ibms390x.h -+++ src/m/ibms390x.h 2009-08-11 12:47:07.000000000 +0000 -@@ -78,7 +78,9 @@ NOTE-END */ - working alloca function and it should be used. Undefine it if an - assembler-language alloca in the file alloca.s should be used. */ - -+#ifndef HAVE_ALLOCA - #define HAVE_ALLOCA -+#endif - - /* On the 64 bit architecture, we can use 60 bits for addresses */ - diff --git a/emacs-23.2.tar.bz2 b/emacs-23.2.tar.bz2 deleted file mode 100644 index f112727..0000000 --- a/emacs-23.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5 -size 38376047 diff --git a/emacs-23.2-gcc45.dif b/emacs-23.3-gcc45.dif similarity index 88% rename from emacs-23.2-gcc45.dif rename to emacs-23.3-gcc45.dif index ac4088e..9cbed1e 100644 --- a/emacs-23.2-gcc45.dif +++ b/emacs-23.3-gcc45.dif @@ -31,7 +31,7 @@ --- src/ccl.c -+++ src/ccl.c 2010-10-18 14:23:41.931926605 +0000 ++++ src/ccl.c 2010-10-18 14:23:42.000000000 +0000 @@ -27,6 +27,9 @@ along with GNU Emacs. If not, see @@ -44,7 +44,7 @@ #include "lisp.h" --- src/charset.c +++ src/charset.c 2010-03-18 09:41:45.000000000 +0000 -@@ -273,7 +273,7 @@ load_charset_map (charset, entries, n_en +@@ -274,7 +274,7 @@ load_charset_map (charset, entries, n_en int n_entries; int control_flag; { @@ -53,7 +53,7 @@ unsigned max_code = CHARSET_MAX_CODE (charset); int ascii_compatible_p = charset->ascii_compatible_p; int min_char, max_char, nonascii_min_char; -@@ -657,7 +657,7 @@ load_charset (charset, control_flag) +@@ -658,7 +658,7 @@ load_charset (charset, control_flag) struct charset *charset; int control_flag; { @@ -128,7 +128,7 @@ int c; struct composition_status *cmp_status = CODING_ISO_CMP_STATUS (coding); Lisp_Object attrs, charset_list; -@@ -5610,7 +5610,7 @@ decode_coding_charset (coding) +@@ -5613,7 +5613,7 @@ decode_coding_charset (coding) { int c; Lisp_Object val; @@ -137,7 +137,7 @@ int dim; int len = 1; unsigned code; -@@ -7773,12 +7773,12 @@ decode_coding_object (coding, src_object +@@ -7817,12 +7817,12 @@ decode_coding_object (coding, src_object Lisp_Object dst_object; { int count = specpdl_ptr - specpdl; @@ -153,7 +153,7 @@ int need_marker_adjustment = 0; Lisp_Object old_deactivate_mark; -@@ -7967,7 +7967,7 @@ encode_coding_object (coding, src_object +@@ -8011,7 +8011,7 @@ encode_coding_object (coding, src_object EMACS_INT chars = to - from; EMACS_INT bytes = to_byte - from_byte; Lisp_Object attrs; @@ -162,7 +162,7 @@ int need_marker_adjustment = 0; int kill_src_buffer = 0; Lisp_Object old_deactivate_mark; -@@ -8307,8 +8307,8 @@ detect_coding_system (src, src_chars, sr +@@ -8351,8 +8351,8 @@ detect_coding_system (src, src_chars, sr base_category = XINT (CODING_ATTR_CATEGORY (attrs)); if (base_category == coding_category_undecided) { @@ -175,7 +175,7 @@ /* Skip all ASCII bytes except for a few ISO2022 controls. */ --- src/fns.c +++ src/fns.c 2010-03-17 13:48:07.000000000 +0000 -@@ -20,6 +20,7 @@ along with GNU Emacs. If not, see @@ -194,7 +194,7 @@ int prop; if (q - p == 10 && memcmp (p + 1, "pixelsize", 9) == 0) -@@ -1656,7 +1656,7 @@ font_unparse_fcname (font, pixel_size, n +@@ -1657,7 +1657,7 @@ font_unparse_fcname (font, pixel_size, n { Lisp_Object family, foundry; Lisp_Object tail, val; @@ -203,18 +203,9 @@ int i, len = 1; char *p; Lisp_Object styles[3]; -@@ -3008,7 +3008,7 @@ font_open_entity (f, entity, pixel_size) - Lisp_Object objlist, size, val, font_object; - struct font *font; - int min_width, height; -- int scaled_pixel_size; -+ int scaled_pixel_size = 0; - - font_assert (FONT_ENTITY_P (entity)); - size = AREF (entity, FONT_SIZE_INDEX); --- src/keyboard.c +++ src/keyboard.c 2010-03-18 09:25:59.000000000 +0000 -@@ -3061,7 +3061,7 @@ read_char (commandflag, nmaps, maps, pre +@@ -3063,7 +3063,7 @@ read_char (commandflag, nmaps, maps, pre if (NILP (c)) { @@ -223,7 +214,7 @@ if (end_time) { -@@ -4555,7 +4555,7 @@ static EMACS_TIME +@@ -4603,7 +4603,7 @@ static EMACS_TIME timer_check_2 () { EMACS_TIME nexttime; @@ -232,7 +223,7 @@ Lisp_Object timers, idle_timers, chosen_timer; struct gcpro gcpro1, gcpro2, gcpro3; -@@ -4592,7 +4592,7 @@ timer_check_2 () +@@ -4640,7 +4640,7 @@ timer_check_2 () Lisp_Object *vector; Lisp_Object timer = Qnil, idle_timer = Qnil; EMACS_TIME timer_time, idle_timer_time; @@ -262,7 +253,7 @@ /* Place where the containing defun starts, or 0 if we didn't come across it yet. */ EMACS_INT defun_start = 0; -@@ -1408,7 +1408,7 @@ skip_chars (forwardp, string, lim, handl +@@ -1411,7 +1411,7 @@ skip_chars (forwardp, string, lim, handl register unsigned int c; unsigned char fastmap[0400]; /* Store the ranges of non-ASCII characters. */ diff --git a/emacs-23.2-ps-bdf.patch b/emacs-23.3-ps-bdf.patch similarity index 94% rename from emacs-23.2-ps-bdf.patch rename to emacs-23.3-ps-bdf.patch index 188ddfe..7f6fcaf 100644 --- a/emacs-23.2-ps-bdf.patch +++ b/emacs-23.3-ps-bdf.patch @@ -1,7 +1,7 @@ --- lisp/ldefs-boot.el +++ lisp/ldefs-boot.el 2009-08-10 16:21:22.000000000 +0000 -@@ -21513,9 +21513,9 @@ With prefix argument \\[universal-prefix - ;;;;;; 49281)) +@@ -21525,9 +21525,9 @@ With prefix argument \\[universal-prefix + ;;;;;; 41642)) ;;; Generated autoloads from ps-bdf.el -(defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ diff --git a/emacs-23.3-s390x.dif b/emacs-23.3-s390x.dif new file mode 100644 index 0000000..f45a3c8 --- /dev/null +++ b/emacs-23.3-s390x.dif @@ -0,0 +1,24 @@ +--- src/m/ibms390x.h ++++ src/m/ibms390x.h 2011-07-11 11:51:06.080426771 +0000 +@@ -78,7 +78,9 @@ NOTE-END */ + working alloca function and it should be used. Undefine it if an + assembler-language alloca in the file alloca.s should be used. */ + ++#ifndef HAVE_ALLOCA + #define HAVE_ALLOCA ++#endif + + /* On the 64 bit architecture, we can use 60 bits for addresses */ + +@@ -88,7 +90,10 @@ NOTE-END */ + + /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ + +-#define XPNTR(a) XUINT (a) ++#undef DATA_SEG_BITS ++#ifdef USE_LISP_UNION_TYPE ++#undef USE_LISP_UNION_TYPE ++#endif + + #undef START_FILES + #define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o diff --git a/emacs-23.2.dif b/emacs-23.3.dif similarity index 98% rename from emacs-23.2.dif rename to emacs-23.3.dif index 5c994a1..ac79264 100644 --- a/emacs-23.2.dif +++ b/emacs-23.3.dif @@ -52,8 +52,8 @@ -rm -f $(DESTDIR)${desktopdir}/emacs.desktop for file in snake-scores tetris-scores; do \ --- configure.in -+++ configure.in 2009-08-12 14:08:02.000000000 +0000 -@@ -451,11 +451,11 @@ dnl see the `changequote' comment above. ++++ configure.in 2011-07-11 10:45:13.843926716 +0200 +@@ -457,11 +457,11 @@ dnl see the `changequote' comment above. esac ;; @@ -67,8 +67,8 @@ machine=arm opsys=gnu-linux ;; -@@ -487,15 +487,15 @@ dnl see the `changequote' comment above. - CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS" +@@ -497,15 +497,15 @@ dnl see the `changequote' comment above. + machine=hp800 opsys=hpux11 ;; - hppa*-*-linux-gnu* ) @@ -86,7 +86,7 @@ machine=ibms390x opsys=gnu-linux ;; rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2* ) -@@ -529,7 +529,7 @@ dnl see the `changequote' comment above. +@@ -539,7 +539,7 @@ dnl see the `changequote' comment above. ;; ## Suns @@ -95,7 +95,7 @@ machine=sparc opsys=gnu-linux ;; -@@ -601,7 +601,7 @@ dnl see the `changequote' comment above. +@@ -611,7 +611,7 @@ dnl see the `changequote' comment above. *-darwin* ) opsys=darwin CPP="${CC-cc} -E -no-cpp-precomp" ;; @@ -104,7 +104,7 @@ *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv5OpenUNIX* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; -@@ -610,28 +610,28 @@ dnl see the `changequote' comment above. +@@ -620,28 +620,28 @@ dnl see the `changequote' comment above. ;; ## m68k Linux-based GNU system @@ -139,16 +139,16 @@ machine=sh3 opsys=gnu-linux ;; -@@ -1003,7 +1003,7 @@ AC_SYS_LARGEFILE - ### In some rare cases, /usr/lib64 exists but does not contain the - ### relevant files (bug#1287). Hence test for crtn.o. +@@ -1010,7 +1010,7 @@ AC_SYS_LARGEFILE + ## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x. + ## Other machine types hard-code the location in src/[ms]/*.h. case "${canonical}" in - x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) + x86_64-*-linux* | s390x-*-linux* ) - if test -e /usr/lib64/crtn.o; then - AC_DEFINE(HAVE_LIB64_DIR, 1, - [Define to 1 if the directory /usr/lib64 exists.]) -@@ -1301,8 +1301,8 @@ fi + ## On x86-64 and s390x GNU/Linux distributions, the standard library + ## can be in a variety of places. We only try /usr/lib64 and /usr/lib. + ## For anything else (eg /usr/lib32), it is up the user to specify +@@ -1321,8 +1321,8 @@ fi if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then @@ -159,7 +159,7 @@ fi x_default_search_path="" x_search_path=${x_libraries} -@@ -2679,7 +2679,7 @@ AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${L +@@ -2711,7 +2711,7 @@ AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE, ${L your loader can find on its own, you might want to add "-L/..." or something similar.]) AC_DEFINE_UNQUOTED(LD_SWITCH_X_SITE_AUX, ${LD_SWITCH_X_SITE_AUX}, diff --git a/emacs-23.3.tar.bz2 b/emacs-23.3.tar.bz2 new file mode 100644 index 0000000..b5a8b20 --- /dev/null +++ b/emacs-23.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6adc96efd794513b25c7c93fcc2e2918353c427c94bd24269f2d82880d29ca4d +size 38689490 diff --git a/emacs.changes b/emacs.changes index 2d923f5..5ccc3a2 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Mon Jul 11 15:25:27 UTC 2011 - werner@suse.de + +- Update to to emacs version 23.3 + * The last-resort backup file `%backup%~' is now written to + `user-emacs-directory', instead of the user's home directory. + * If Emacs creates `user-emacs-directory', that directory's + permissions are now set to rwx------, ignoring the umask. + * The appt-add command takes an optional argument, the warning time. + This can be used in place of the default appt-message-warning-time. + * You can allow inferior Python processes to load modules from the + current directory by setting `python-remove-cwd-from-path' to nil. + * The default value of `rmail-enable-mime' is now t. Rmail decodes + MIME contents automatically. You can customize the variable + `rmail-enable-mime' back to `nil' to disable this automatic MIME + decoding. + * The command `rmail-mime' change the displaying of a MIME message + between decoded presentation form and raw data if `rmail-enable-mime' + is non-nil. And, with prefix argument, it change only the displaying + of the MIME entity at point. + * The new command `rmail-mime-next-item' (bound to TAB) moves point + to the next item of MIME message. + * The new command `rmail-mime-previous-item' (bound to backtab) moves + point to the previous item of MIME message. + * The new command `rmail-mime-toggle-hidden' (RET) hide or show the + body of the MIME entity at point. + * New VC command `vc-log-incoming', bound to `C-x v I'. + This shows a log of changes to be received with a pull operation. + For Git, this runs "git fetch" to make the necessary data available + locally; this requires version 1.7 or newer. + * New VC command `vc-log-outgoing', bound to `C-x v O'. + This shows a log of changes to be sent in the next commit. + * New VC command vc-find-conflicted-file. + * The 'g' key in VC diff, log, log-incoming and log-outgoing buffers + reruns the corresponding VC command to compute an up to date version + of the buffer. + * vc-dir for Bzr supports viewing shelve contents and shelving snapshots. + * Special markup can be added to log-edit buffers. + You can add headers specifying additional information to be supplied + to the version control system. + Bazaar recognizes the headers "Author", "Date" and "Fixes". + Git, Mercurial, and Monotone recognize "Author" and "Date". + Any unknown header is left as is in the message, so it is not lost. + * lmenu.el and cl-compat.el are now obsolete. + * smie.el is a generic navigation and indentation engine. + It takes a simple BNF description of the grammar, and provides both + sexp-style navigation (jumping over begin..end pairs) as well as + indentation, which can be adjusted via ad-hoc indentation rules. + * posn-col-row now excludes the header line from the row count + If the frame has a header line, posn-col-row will count row numbers + starting from the first line of text below the header line. + * `e' and `pi' are now called `float-e' and `float-pi'. + The old names are obsolete. + * The use of unintern without an obarray arg is now obsolete. + * The function `princ-list' is now obsolete. + * The yank-handler argument to kill-region and friends is now obsolete. + * New function byte-to-string, like char-to-string but for bytes. +- Remove obsolete patches +- Adopt s390x patch +- Refresh some others patches + ------------------------------------------------------------------- Wed Mar 23 14:38:32 JST 2011 - ftake@geeko.jp - Add a new patch to fix "dual font spacing problem" diff --git a/emacs.spec b/emacs.spec index fafd5e8..9af4674 100644 --- a/emacs.spec +++ b/emacs.spec @@ -29,41 +29,39 @@ BuildRequires: gpm Url: http://www.gnu.org/software/emacs/ License: GPLv2+ Group: Productivity/Editors/Emacs -Version: 23.2 -Release: 10 -Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc +Version: 23.3 +Release: 1 +Obsoletes: ge_exec ge_site emacmisc emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} Requires: ctags -Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc +Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc emacmisc AutoReqProv: on Summary: GNU Emacs Base Package -Source: emacs-23.2.tar.bz2 +Source: ftp://mirrors.kernel.org/gnu/emacs/emacs-23.3.tar.bz2 Source1: app-defaults.Emacs Source2: site-lisp.tar.bz2 Source3: dot.gnu-emacs Source4: emacs-rpmlintrc Source5: emacs.desktop -Patch: emacs-23.2.dif +Patch: emacs-23.3.dif Patch1: emacs-23.2-linkscr.patch Patch2: emacs-23.1-glibc.patch Patch3: emacs-23.2-decl.dif Patch4: emacs-23.1-asian-print.patch -Patch5: emacs-23.2-ps-bdf.patch +Patch5: emacs-23.3-ps-bdf.patch Patch6: emacs-23.1-ppc64.patch Patch7: emacs-23.1-ps-mule.patch Patch8: emacs-22.0.99-nonvoid.patch Patch9: emacs-22.0.99-sendmail-path.patch Patch11: emacs-22.0.99-xim.patch Patch12: emacs-22.0.99-x11r7.patch -Patch13: emacs-23.2-s390x.dif +Patch13: emacs-23.3-s390x.dif Patch15: emacs-22.2-iconic.patch Patch16: emacs-23.1-flyspell.patch Patch18: emacs-sparc.diff -Patch20: emacs-23.2-gcc45.dif +Patch20: emacs-23.3-gcc45.dif Patch22: emacs-23.1-bnc628268.patch -Patch23: emacs-23.1-rst.patch -Patch24: emacs-23.2-dual-font.patch 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)} @@ -105,8 +103,9 @@ Authors: %package -n emacs-nox License: GPLv2+ PreReq: fileutils +Obsoletes: emac_nox Requires: emacs = %{version}-%{release} -Provides: emacs_program = %{version}-%{release} +Provides: emacs_program = %{version}-%{release}, emac_nox Summary: GNU Emacs-nox: An Emacs Binary without X Window System Support Group: Productivity/Editors/Emacs AutoReqProv: on @@ -137,9 +136,10 @@ Authors: %package -n emacs-x11 License: GPLv2+ PreReq: fileutils +Obsoletes: emacsbin Requires: emacs = %{version}-%{release} Enhances: xorg-x11-libs -Provides: emacs_program = %{version}-%{release} +Provides: emacs_program = %{version}-%{release} emacsbin Provides: emacs:/usr/bin/emacs ge_exec:/usr/bin/emacs Summary: GNU Emacs: Emacs binary with X Window System Support Group: Productivity/Editors/Emacs @@ -173,6 +173,7 @@ Authors: License: GPLv2+ Obsoletes: ge_lisp Requires: emacs = %{version}-%{release} +Provides: ge_lisp Summary: Several Lisp Files for GNU Emacs Group: Productivity/Editors/Emacs AutoReqProv: on @@ -202,7 +203,7 @@ Authors: %package -n emacs-info License: GPLv2+ Obsoletes: ge_info elispman elisp-manual elispint emacs-lisp-intro -Provides: elispman elisp-manual elispint emacs-lisp-intro +Provides: elispman elisp-manual elispint emacs-lisp-intro ge_info Summary: Info files for GNU Emacs Group: Productivity/Editors/Emacs PreReq: %install_info_prereq @@ -254,8 +255,6 @@ if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then fi %patch20 -p0 -b .gcc45 %patch22 -%patch23 -%patch24 %build CC=gcc-4.3 @@ -1646,11 +1645,15 @@ done %{_datadir}/emacs/%{version}/lisp/cedet/data-debug.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede.elc %dir %{_datadir}/emacs/%{version}/lisp/cedet/ede/ +%{_datadir}/emacs/%{version}/lisp/cedet/ede/auto.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/autoconf-edit.elc +%{_datadir}/emacs/%{version}/lisp/cedet/ede/base.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/cpp-root.elc +%{_datadir}/emacs/%{version}/lisp/cedet/ede/custom.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/dired.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/emacs.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/files.elc +%{_datadir}/emacs/%{version}/lisp/cedet/ede/generic.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/linux.elc %{_datadir}/emacs/%{version}/lisp/cedet/ede/loaddefs.el %{_datadir}/emacs/%{version}/lisp/cedet/ede/locate.elc @@ -1859,7 +1862,6 @@ done %{_datadir}/emacs/%{version}/lisp/emacs-lisp/chart.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/check-declare.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/checkdoc.elc -%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-compat.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-extra.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-indent.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-loaddefs.el @@ -1896,7 +1898,6 @@ done %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mnt.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mode.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp.elc -%{_datadir}/emacs/%{version}/lisp/emacs-lisp/lmenu.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/macroexp.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/map-ynp.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/pp.elc @@ -1906,6 +1907,7 @@ done %{_datadir}/emacs/%{version}/lisp/emacs-lisp/ring.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/rx.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/shadow.elc +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/smie.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/sregex.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/syntax.elc %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-ses.elc @@ -2486,6 +2488,7 @@ done %{_datadir}/emacs/%{version}/lisp/nxml/xsd-regexp.elc %dir %{_datadir}/emacs/%{version}/lisp/obsolete/ %{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.elc %{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.elc %{_datadir}/emacs/%{version}/lisp/obsolete/iso-acc.elc %{_datadir}/emacs/%{version}/lisp/obsolete/iso-insert.elc @@ -2493,6 +2496,7 @@ done %{_datadir}/emacs/%{version}/lisp/obsolete/keyswap.el %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.elc %{_datadir}/emacs/%{version}/lisp/obsolete/levents.elc +%{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.elc %{_datadir}/emacs/%{version}/lisp/obsolete/lucid.elc %{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.elc %{_datadir}/emacs/%{version}/lisp/obsolete/options.elc @@ -3097,11 +3101,15 @@ done %{_datadir}/emacs/%{version}/lisp/cedet/cedet.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/data-debug.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/ede.el.gz +%{_datadir}/emacs/%{version}/lisp/cedet/ede/auto.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/ede/autoconf-edit.el.gz +%{_datadir}/emacs/%{version}/lisp/cedet/ede/base.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/ede/cpp-root.el.gz +%{_datadir}/emacs/%{version}/lisp/cedet/ede/custom.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/ede/dired.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/ede/emacs.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/ede/files.el.gz +%{_datadir}/emacs/%{version}/lisp/cedet/ede/generic.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/ede/linux.el.gz %{_datadir}/emacs/%{version}/lisp/cedet/ede/loaddefs.el %{_datadir}/emacs/%{version}/lisp/cedet/ede/locate.el.gz @@ -3301,7 +3309,6 @@ done %{_datadir}/emacs/%{version}/lisp/emacs-lisp/chart.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/check-declare.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/checkdoc.el.gz -%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-compat.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-extra.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-indent.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-macs.el.gz @@ -3336,7 +3343,6 @@ done %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mnt.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp-mode.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/lisp.el.gz -%{_datadir}/emacs/%{version}/lisp/emacs-lisp/lmenu.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/macroexp.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/map-ynp.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/pp.el.gz @@ -3346,6 +3352,7 @@ done %{_datadir}/emacs/%{version}/lisp/emacs-lisp/ring.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/rx.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/shadow.el.gz +%{_datadir}/emacs/%{version}/lisp/emacs-lisp/smie.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/sregex.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/syntax.el.gz %{_datadir}/emacs/%{version}/lisp/emacs-lisp/tcover-ses.el.gz @@ -3865,12 +3872,14 @@ done %{_datadir}/emacs/%{version}/lisp/nxml/xmltok.el.gz %{_datadir}/emacs/%{version}/lisp/nxml/xsd-regexp.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/awk-mode.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/cl-compat.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/fast-lock.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/iso-acc.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/iso-insert.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/iso-swed.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/lazy-lock.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/levents.el.gz +%{_datadir}/emacs/%{version}/lisp/obsolete/lmenu.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/lucid.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/old-whitespace.el.gz %{_datadir}/emacs/%{version}/lisp/obsolete/options.el.gz