From a8163b3c90fc33d378bba2f017c1286827d1cb26 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Mar 18 2013 15:42:22 +0000 Subject: Updating to the newest upstream version --- diff --git a/.gitignore b/.gitignore index 8102a3f..a5fc48d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /emacs-24.1-rc.tar.gz /emacs-24.1.tar.bz2 /emacs-24.2.tar.xz +/emacs-24.3.tar.xz diff --git a/emacs-24.2-hunspell.patch b/emacs-24.2-hunspell.patch deleted file mode 100644 index dc90b2f..0000000 --- a/emacs-24.2-hunspell.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -up emacs-24.2/lisp/textmodes/ispell.el.hunspell emacs-24.2/lisp/textmodes/ispell.el ---- emacs-24.2/lisp/textmodes/ispell.el.hunspell 2013-01-21 18:45:01.743335126 +0100 -+++ emacs-24.2/lisp/textmodes/ispell.el 2013-01-21 18:51:02.082010837 +0100 -@@ -572,6 +572,40 @@ re-start Emacs." - (coding-system :tag "Coding System"))) - :group 'ispell) - -+(defvar ispell-hunspell-dictionary-equivs-alist -+ '(("american" "en_US") -+ ("brasileiro" "pt_BR") -+ ("british" "en_GB") -+ ("castellano" "es_ES") -+ ("castellano8" "es_ES") -+ ("czech" "cs_CZ") -+ ("dansk" "da_DK") -+ ("deutsch" "de_DE") -+ ("deutsch8" "de_DE") -+ ("english" "en_US") -+ ("esperanto" "eo") -+ ("esperanto-tex" "eo") -+ ("finnish" "fi_FI") -+ ("francais7" "fr_FR") -+ ("francais" "fr_FR") -+ ("francais-tex" "fr_FR") -+ ("german" "de_DE") -+ ("german8" "de_DE") -+ ("italiano" "it_IT") -+ ("nederlands" "nl_NL") -+ ("nederlands8" "nl_NL") -+ ("norsk" "nn_NO") -+ ("norsk7-tex" "nn_NO") -+ ("polish" "pl_PL") -+ ("portugues" "pt_PT") -+ ("russian" "ru_RU") -+ ("russianw" "ru_RU") -+ ("slovak" "sk_SK") -+ ("slovenian" "sl_SI") -+ ("svenska" "sv_SE") -+ ("hebrew" "he_IL")) -+ "Alist with matching hunspell dict names for standard dict names in -+ `ispell-dictionary-base-alist'.") - - (defvar ispell-dictionary-base-alist - '((nil -@@ -1106,9 +1140,57 @@ aspell is used along with Emacs).") - ispell-encoding8-command) - ispell-aspell-dictionary-alist - nil)) -+ (ispell-dictionary-base-alist ispell-dictionary-base-alist) - ispell-base-dicts-override-alist ; Override only base-dicts-alist - all-dicts-alist) - -+ ;; While ispell and aspell (through aliases) use the traditional -+ ;; dict naming originally expected by ispell.el, hunspell -+ ;; uses locale based names with no alias. We need to map -+ ;; standard names to locale based names to make default dict -+ ;; definitions available for hunspell. -+ (if ispell-really-hunspell -+ (let (tmp-dicts-alist) -+ (dolist (adict ispell-dictionary-base-alist) -+ (let* ((dict-name (nth 0 adict)) -+ (dict-equiv -+ (cadr (assoc dict-name -+ ispell-hunspell-dictionary-equivs-alist))) -+ (ispell-args (nth 5 adict)) -+ (ispell-args-has-d (member "-d" ispell-args)) -+ skip-dict) -+ ;; Remove "-d" option from `ispell-args' if present -+ (if ispell-args-has-d -+ (let ((ispell-args-after-d -+ (cdr (cdr ispell-args-has-d))) -+ (ispell-args-before-d -+ (butlast ispell-args (length ispell-args-has-d)))) -+ (setq ispell-args -+ (nconc ispell-args-before-d -+ ispell-args-after-d)))) -+ ;; Unless default dict, re-add "-d" option with the mapped value -+ (if dict-name -+ (if dict-equiv -+ (nconc ispell-args (list "-d" dict-equiv)) -+ (message -+ "ispell-set-spellchecker-params: Missing hunspell equiv for \"%s\". Skipping." -+ dict-name) -+ (setq skip-dict t))) -+ -+ (unless skip-dict -+ (add-to-list 'tmp-dicts-alist -+ (list -+ dict-name ; dict name -+ (nth 1 adict) ; casechars -+ (nth 2 adict) ; not-casechars -+ (nth 3 adict) ; otherchars -+ (nth 4 adict) ; many-otherchars-p -+ ispell-args ; ispell-args -+ (nth 6 adict) ; extended-character-mode -+ (nth 7 adict) ; dict encoding -+ )))) -+ (setq ispell-dictionary-base-alist tmp-dicts-alist)))) -+ - (run-hooks 'ispell-initialize-spellchecker-hook) - - ;; Add dicts to ``ispell-dictionary-alist'' unless already present. diff --git a/emacs-24.3-hunspell.patch b/emacs-24.3-hunspell.patch new file mode 100644 index 0000000..174c2e5 --- /dev/null +++ b/emacs-24.3-hunspell.patch @@ -0,0 +1,103 @@ +diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el +index 1daec44..7167dc9 100644 +--- a/lisp/textmodes/ispell.el ++++ b/lisp/textmodes/ispell.el +@@ -574,6 +574,40 @@ re-start Emacs." + (coding-system :tag "Coding System"))) + :group 'ispell) + ++(defvar ispell-hunspell-dictionary-equivs-alist ++ '(("american" "en_US") ++ ("brasileiro" "pt_BR") ++ ("british" "en_GB") ++ ("castellano" "es_ES") ++ ("castellano8" "es_ES") ++ ("czech" "cs_CZ") ++ ("dansk" "da_DK") ++ ("deutsch" "de_DE") ++ ("deutsch8" "de_DE") ++ ("english" "en_US") ++ ("esperanto" "eo") ++ ("esperanto-tex" "eo") ++ ("finnish" "fi_FI") ++ ("francais7" "fr_FR") ++ ("francais" "fr_FR") ++ ("francais-tex" "fr_FR") ++ ("german" "de_DE") ++ ("german8" "de_DE") ++ ("italiano" "it_IT") ++ ("nederlands" "nl_NL") ++ ("nederlands8" "nl_NL") ++ ("norsk" "nn_NO") ++ ("norsk7-tex" "nn_NO") ++ ("polish" "pl_PL") ++ ("portugues" "pt_PT") ++ ("russian" "ru_RU") ++ ("russianw" "ru_RU") ++ ("slovak" "sk_SK") ++ ("slovenian" "sl_SI") ++ ("svenska" "sv_SE") ++ ("hebrew" "he_IL")) ++ "Alist with matching hunspell dict names for standard dict names in ++ `ispell-dictionary-base-alist'.") + + (defvar ispell-dictionary-base-alist + '((nil ; default +@@ -1112,9 +1146,57 @@ aspell is used along with Emacs).") + ispell-encoding8-command) + ispell-aspell-dictionary-alist + nil)) ++ (ispell-dictionary-base-alist ispell-dictionary-base-alist) + ispell-base-dicts-override-alist ; Override only base-dicts-alist + all-dicts-alist) + ++ ;; While ispell and aspell (through aliases) use the traditional ++ ;; dict naming originally expected by ispell.el, hunspell ++ ;; uses locale based names with no alias. We need to map ++ ;; standard names to locale based names to make default dict ++ ;; definitions available for hunspell. ++ (if ispell-really-hunspell ++ (let (tmp-dicts-alist) ++ (dolist (adict ispell-dictionary-base-alist) ++ (let* ((dict-name (nth 0 adict)) ++ (dict-equiv ++ (cadr (assoc dict-name ++ ispell-hunspell-dictionary-equivs-alist))) ++ (ispell-args (nth 5 adict)) ++ (ispell-args-has-d (member "-d" ispell-args)) ++ skip-dict) ++ ;; Remove "-d" option from `ispell-args' if present ++ (if ispell-args-has-d ++ (let ((ispell-args-after-d ++ (cdr (cdr ispell-args-has-d))) ++ (ispell-args-before-d ++ (butlast ispell-args (length ispell-args-has-d)))) ++ (setq ispell-args ++ (nconc ispell-args-before-d ++ ispell-args-after-d)))) ++ ;; Unless default dict, re-add "-d" option with the mapped value ++ (if dict-name ++ (if dict-equiv ++ (nconc ispell-args (list "-d" dict-equiv)) ++ (message ++ "ispell-set-spellchecker-params: Missing hunspell equiv for \"%s\". Skipping." ++ dict-name) ++ (setq skip-dict t))) ++ ++ (unless skip-dict ++ (add-to-list 'tmp-dicts-alist ++ (list ++ dict-name ; dict name ++ (nth 1 adict) ; casechars ++ (nth 2 adict) ; not-casechars ++ (nth 3 adict) ; otherchars ++ (nth 4 adict) ; many-otherchars-p ++ ispell-args ; ispell-args ++ (nth 6 adict) ; extended-character-mode ++ (nth 7 adict) ; dict encoding ++ )))) ++ (setq ispell-dictionary-base-alist tmp-dicts-alist)))) ++ + (run-hooks 'ispell-initialize-spellchecker-hook) + + ;; Add dicts to ``ispell-dictionary-alist'' unless already present. diff --git a/emacs-bz11580-eudc-bbdb.patch b/emacs-bz11580-eudc-bbdb.patch deleted file mode 100644 index 98cf4f5..0000000 --- a/emacs-bz11580-eudc-bbdb.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Sergio Durigan Junior -Date: Tue, 02 Oct 2012 05:10:16 +0000 -Subject: Bugfix for EUDCB-BBDB queries. - -* net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix -querying BBDB for entries without a last name. - -2012-10-02 Sergio Durigan Junior - - * net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix - querying BBDB for entries without a last name (Bug#11580). - -Index: emacs-23.3/lisp/net/eudcb-bbdb.el -=================================================================== ---- emacs-23.3.orig/lisp/net/eudcb-bbdb.el -+++ emacs-23.3/lisp/net/eudcb-bbdb.el -@@ -169,18 +169,18 @@ The record is filtered according to `eud - (symbol-name attr))) - 'record)))) - (t -- (setq val "Unknown BBDB attribute"))) -- (if val -- (cond -- ((memq attr '(phones addresses)) -- (setq eudc-rec (append val eudc-rec))) -- ((and (listp val) -- (= 1 (length val))) -- (setq eudc-rec (cons (cons attr (car val)) eudc-rec))) -- ((> (length val) 0) -- (setq eudc-rec (cons (cons attr val) eudc-rec))) -- (t -- (error "Unexpected attribute value"))))) -+ (error "Unknown BBDB attribute"))) -+ (cond -+ ((or (not val) (equal val ""))) ; do nothing -+ ((memq attr '(phones addresses)) -+ (setq eudc-rec (append val eudc-rec))) -+ ((and (listp val) -+ (= 1 (length val))) -+ (setq eudc-rec (cons (cons attr (car val)) eudc-rec))) -+ ((> (length val) 0) -+ (setq eudc-rec (cons (cons attr val) eudc-rec))) -+ (t -+ (error "Unexpected attribute value")))) - (nreverse eudc-rec))) - - diff --git a/emacs-locate-library.patch b/emacs-locate-library.patch deleted file mode 100644 index 0d352bc..0000000 --- a/emacs-locate-library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up emacs-24.1/lisp/org/org-exp-blocks.el.locate-library emacs-24.1/lisp/org/org-exp-blocks.el ---- emacs-24.1/lisp/org/org-exp-blocks.el.locate-library 2012-07-11 17:11:42.053056590 +0200 -+++ emacs-24.1/lisp/org/org-exp-blocks.el 2012-07-11 17:11:47.716973793 +0200 -@@ -240,7 +240,7 @@ which defaults to the value of `org-expo - (file-name-as-directory - (expand-file-name - "../contrib" -- (file-name-directory (find-library-name "org"))))))) -+ (file-name-directory (locate-library "org"))))))) - "Path to the ditaa jar executable." - :group 'org-babel - :type 'string) diff --git a/emacs-spellchecker.patch b/emacs-spellchecker.patch index cc2003b..24e1d3c 100644 --- a/emacs-spellchecker.patch +++ b/emacs-spellchecker.patch @@ -1,15 +1,16 @@ -qdiff -up emacs-23.3/lisp/textmodes/ispell.el.spellcheck emacs-23.3/lisp/textmodes/ispell.el ---- emacs-23.3/lisp/textmodes/ispell.el.spellcheck 2011-11-16 10:54:57.363513864 +0100 -+++ emacs-23.3/lisp/textmodes/ispell.el 2011-11-16 10:55:17.209577635 +0100 -@@ -348,9 +348,9 @@ Must be greater than 1." +diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el +index 1d28de7..1daec44 100644 +--- a/lisp/textmodes/ispell.el ++++ b/lisp/textmodes/ispell.el +@@ -351,9 +351,9 @@ Must be greater than 1." :group 'ispell) (defcustom ispell-program-name -- (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p) -+ (or (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p) -+ (locate-file "aspell" exec-path exec-suffixes 'file-executable-p) - (locate-file "ispell" exec-path exec-suffixes 'file-executable-p) -- (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p) +- (or (executable-find "aspell") ++ (or (executable-find "hunspell") ++ (executable-find "aspell") + (executable-find "ispell") +- (executable-find "hunspell") "ispell") "Program invoked by \\[ispell-word] and \\[ispell-region] commands." :type 'string diff --git a/emacs.spec b/emacs.spec index bf7f0d0..5852bbc 100644 --- a/emacs.spec +++ b/emacs.spec @@ -2,8 +2,8 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 24.2 -Release: 12%{?dist} +Version: 24.3 +Release: 1%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -18,12 +18,8 @@ Source6: emacs-terminal.desktop Source7: emacs-terminal.sh # rhbz#713600 Patch7: emacs-spellchecker.patch -# rhbz#830162, fixed in org-mode upstream -Patch8: emacs-locate-library.patch -# Fix for Emacs bug #111500. -Patch9: emacs-bz11580-eudc-bbdb.patch # Fix for emacs bug #13460. -Patch100: emacs-24.2-hunspell.patch +Patch100: emacs-24.3-hunspell.patch BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel BuildRequires: libjpeg-devel libtiff-devel libX11-devel libXau-devel libXdmcp-devel libXrender-devel libXt-devel @@ -31,13 +27,17 @@ BuildRequires: libXpm-devel ncurses-devel xorg-x11-proto-devel zlib-devel gnutls BuildRequires: librsvg2-devel m17n-lib-devel libotf-devel ImageMagick-devel libselinux-devel BuildRequires: GConf2-devel alsa-lib-devel gpm-devel liblockfile-devel libxml2-devel BuildRequires: bzip2 cairo texinfo gzip desktop-file-utils -%if 0%{?el6} +%if 0%{?rhel} == 6 BuildRequires: gtk2-devel %else +%if 0%{?rhel} == 7 +BuildRequires: gtk3-devel python2-devel # Buildrequire both python2 and python3 on systems containing both, # since below we turn off the brp-python-bytecompile script +%else BuildRequires: gtk3-devel python2-devel python3-devel %endif +%endif %ifarch %{ix86} BuildRequires: util-linux %endif @@ -153,8 +153,6 @@ packages that add functionality to Emacs. %setup -q %patch7 -p1 -b .spellchecker -%patch8 -p1 -b .locate-library -%patch9 -p1 -b .emacs-bz11580-eudc-bbdb %patch100 -p1 -b .hunspell @@ -173,12 +171,12 @@ rm -f lisp/play/tetris.el lisp/play/tetris.elc rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES %endif -%define info_files ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman +#%define info_files ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman -if test "$(perl -e 'while (<>) { if (/^INFO_FILES/) { s/.*=//; while (s/\\$//) { s/\\//; $_ .= <>; }; s/\s+/ /g; s/^ //; s/ $//; print; exit; } }' Makefile.in)" != "%info_files"; then - echo Please update info_files >&2 - exit 1 -fi +#if test "$(perl -e 'while (<>) { if (/^INFO_FILES/) { s/.*=//; while (s/\\$//) { s/\\//; $_ .= <>; }; s/\s+/ /g; s/^ //; s/ $//; print; exit; } }' Makefile.in)" != "%info_files"; then +# echo Please update info_files >&2 +# exit 1 +#fi %ifarch %{ix86} %define setarch setarch %{_arch} -R @@ -432,6 +430,10 @@ update-desktop-database &> /dev/null || : %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Mon Mar 18 2013 Petr Hracek - 1:24.3-1 +- Updated to the newest upstream release +- solved problem with distribution flag in case of rhel + * Mon Mar 18 2013 Rex Dieter 1:24.2-12 - rebuild (ImageMagick) @@ -616,7 +618,7 @@ update-desktop-database &> /dev/null || : - Added filesystem subpackage (rhbz#661866) - Added emacsclient desktop file (rhbz#665362) -* Thu Jan 7 2011 Karel Klic - 1:23.2-16 +* Fri Jan 7 2011 Karel Klic - 1:23.2-16 - Removed dependency on both hunspell and aspell. Emacs does not _require_ spell checker, e.g. if user wants to uninstall one, there is no reason why Emacs should also be uninstalled. Emacs can run one @@ -626,7 +628,7 @@ update-desktop-database &> /dev/null || : - Cleaned spec file header - Removed gcc-4.5.0 specific CFLAGS -* Thu Jan 7 2011 Karel Klic - 1:23.2-15 +* Fri Jan 7 2011 Karel Klic - 1:23.2-15 - The emacs-terminal package now requires emacs package * Thu Jan 6 2011 Karel Klic - 1:23.2-14 @@ -926,7 +928,7 @@ update-desktop-database &> /dev/null || : - fix pkgconfig path (from pkg-config to pkgconfig (Jonathan Underwood) - use macro instead of variable style for buildroot. -* Mon Aug 28 2007 Chip Coldwell - 22.1-3 +* Tue Aug 28 2007 Chip Coldwell - 22.1-3 - change group from Development to Utility * Mon Aug 13 2007 Chip Coldwell - 22.1-2 @@ -934,7 +936,7 @@ update-desktop-database &> /dev/null || : - glibc-open-macro.patch to deal with glibc turning "open" into a macro. - leave emacs info pages in default section (Resolves: bz199008) -* Fri Jun 6 2007 Chip Coldwell - 22.1-1 +* Wed Jun 6 2007 Chip Coldwell - 22.1-1 - move alternatives install to posttrans scriptlet (Resolves: bz239745) - new release tarball from FSF (Resolves: bz245303) - new php-mode 1.2.0 @@ -1266,7 +1268,7 @@ update-desktop-database &> /dev/null || : and remove redundant next-line-add-newlines setting - update info_file list (Reuben Thomas,114729) -* Wed Mar 16 2004 Mike A. Harris 21.3-11 +* Tue Mar 16 2004 Mike A. Harris 21.3-11 - Removed bogus Requires: XFree86-libs that was added in 21.3-8, as rpm find-requires will automatically pick up the dependancies on any runtime libraries, and such hard coded requires is not X11 implementation @@ -1587,7 +1589,7 @@ update-desktop-database &> /dev/null || : * Sat Jan 27 2001 Jakub Jelinek - Preprocess Makefiles as if they were assembly, not C source. -* Thu Jan 24 2001 Yukihiro Nakai +* Wed Jan 24 2001 Yukihiro Nakai - Fix the fontset problem when creating a new frame. * Thu Jan 18 2001 Trond Eivind Glomsrød diff --git a/sources b/sources index 2b79671..85e77ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -066f712b82f77c3c3c803e98bff2318b emacs-24.2.tar.xz +ea9ed000ca165280265aabb55b9afbd7 emacs-24.3.tar.xz