Merge branch 'master' into f19

Conflicts: emacs.spec
emacs -mm (maximized) does not work (#985729 )
2013-08-14 15:43:34 +02:00 · 2013-08-09 14:08:36 +02:00 · 2013-07-22 11:19:14 +02:00 · 2013-07-15 14:32:50 +02:00 · 2013-04-10 08:46:00 +02:00 · 2013-04-08 13:26:23 +02:00
3 changed files with 22 additions and 13 deletions
--- a/emacs-24.2-hunspell.2.patch
+++ b/emacs-24.2-hunspell.2.patch
@ -0,0 +1,13 @@
+diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
+index 2740d9c..e56e576 100644
+--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
+@@ -1171,7 +1171,7 @@ aspell is used along with Emacs).")
+ 		;; Unless default dict, re-add "-d" option with the mapped value
+ 		(if dict-name
+ 		    (if dict-equiv
+-			(nconc ispell-args (list "-d" dict-equiv))
+			(setq ispell-args (nconc ispell-args (list "-d" dict-equiv)))
+ 		      (message
+ 		       "ispell-set-spellchecker-params: Missing hunspell equiv for \"%s\". Skipping."
+ 		       dict-name)
--- a/emacs-bell-dont-work.patch
+++ b/emacs-bell-dont-work.patch
@ -11,7 +11,7 @@ index 62f53a3..a6f2f04 100644
 
   AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
 diff --git a/src/xterm.c b/src/xterm.c
-index fb407c8..102ce43 100644
+index fb407c8..f47141d 100644
 --- a/src/xterm.c
 +++ b/src/xterm.c
@@ -130,6 +130,10 @@ extern void _XEditResCheckMessages (Widget, XtPointer, XEvent *, Boolean *);
@ -30,7 +30,7 @@ index fb407c8..102ce43 100644
 	{
 	  block_input ();
 +#ifdef HAVE_XKB
-+      XkbBell (FRAME_X_DISPLAY (f), None, 0, None);
+	  XkbBell (FRAME_X_DISPLAY (f), None, 0, None);
 +#else
 	  XBell (FRAME_X_DISPLAY (f), 0);
 +#endif
--- a/emacs.spec
+++ b/emacs.spec
@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 24.3
-Release: 13%{?dist}
+Release: 11%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@ -18,7 +18,10 @@ 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 #922519
 Patch10: emacs-style-change-cb.patch
 # Fix for emacs bug #562719
@ -42,7 +45,6 @@ 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%{?rhel} == 6
 BuildRequires: gtk2-devel
 %else
@ -462,18 +464,12 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d

 %changelog
-* Wed Aug 14 2013 Jaromir Koncicky <jkoncick@redhat.com> - 1:24.3-13
+* Wed Aug 14 2013 Jaromir Koncicky <jkoncick@redhat.com> - 1:24.3-11
 - Fix default PDF viewer (#971162)

-* Fri Aug 09 2013 Petr Hracek <phracek@redhat.com> - 1:24.3-12
+* Fri Aug 09 2013 Petr Hracek <phracek@redhat.com> - 1:24.3-10
 - emacs -mm (maximized) does not work (#985729)

-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:24.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 1:24.3-10
- Perl 5.18 rebuild
-
 * Tue Apr 09 2013 Petr Hracek <phracek@redhat.com> - 1:24.3-9
 - Help and man page corrections (#948838)
Author	SHA1	Message	Date
Jaromír Končický	dc3494f96e	Merge branch 'master' into f19 Conflicts: emacs.spec	2013-08-14 15:43:34 +02:00
Petr Hracek	6863ad8791	emacs -mm (maximized) does not work (#985729 )	2013-08-09 14:08:36 +02:00
Petr Hracek	29fd17692e	new upstream version 24.3	2013-07-22 11:19:14 +02:00
Petr Hracek	a90aaf3e3b	Bump the version (#981135 ) to 20	2013-07-15 14:32:50 +02:00
Petr Hracek	ed3797bde4	Help and manpage corrections (#948838 )	2013-04-10 08:46:00 +02:00
Petr Hracek	1e51ea0bb9	Spell checking broken by non-default dictionary (#827033 )	2013-04-08 13:26:23 +02:00
Petr Hracek	a0dbe3ce2b	Fix #929353 : adding patch emacs-gtk-warning.patch	2013-04-04 12:29:21 +02:00
Petr Hracek	d4a812fad8	Fix:#929353 emacs gives gtk-WARNING	2013-04-04 12:23:13 +02:00
Petr Hracek	32580573e9	bell does not work (#526719 )	2013-03-28 15:14:12 +01:00
Petr Hracek	1dde37e57e	Fix for emacs bug 112144, style_changed_cb (#922519 )	2013-03-28 14:22:17 +01:00
Petr Hracek	a9f326d8df	deleting return code	2013-03-28 10:22:22 +01:00
Petr Hracek	f32435b905	remove debugging info	2013-03-27 08:39:43 +01:00
Petr Hracek	d61c164ebe	fixing build on RHEL-7.0	2013-03-26 17:38:31 +01:00
Petr Hracek	1684d20792	fixing distribution flags to rhel instead of el6:1	2013-03-26 16:56:40 +01:00
Petr Hracek	6bc6c875b3	fixing distribution flags to rhel instead of el6:1	2013-03-26 14:42:13 +01:00
Petr Hracek	8885fc80b9	Wrongly used flags	2013-03-18 16:44:45 +01:00
Petr Hracek	32e51e58c6	solved problem with distribution flag	2013-03-18 15:34:39 +01:00
Petr Hracek	c6b688e7af	solved detection of rhel distribution flag	2013-03-18 15:30:18 +01:00