Merge branch 'master' into f17

.gitignore

@@ -5,3 +5,4 @@
 /emacs-24.0.94.tar.gz
 /emacs-24.0.95.tar.gz
 /emacs-24.0.97.tar.gz
+/emacs-24.1-rc.tar.gz

emacs.spec

@@ -2,13 +2,13 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
-Version: 24.0.97
+Version: 24.1
-Release: 1%{?dist}
+Release: 0.rc1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
 #Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2
-Source0: http://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.gz
+Source0: http://alpha.gnu.org/gnu/emacs/pretest/emacs-24.1-rc.tar.gz
 Source1: emacs.desktop
 Source2: emacsclient.desktop
 Source3: dotemacs.el
@@ -434,6 +434,10 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Fri Jun  8 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-0.rc1
+- New upstream prerelease
+- Cleanup of the %%changelog section
+
 * Mon May 21 2012 Karel Klíč <kklic@redhat.com> - 1:24.0.97-1
 - Newest prerelease
 
@@ -1631,7 +1635,7 @@ update-desktop-database &> /dev/null || :
 
 * Wed Jun 14 2000 Matt Wilson <msw@redhat.com>
 - edited japanese patch not to patch configure
-- fixed a missing escaped " in a wc string
+- fixed a missing escaped \" in a wc string
 - merge japanese support to head of development
 
 * Tue Jun 13 2000 Trond Eivind Glomsrød <teg@redhat.com>

sources

@@ -1,2 +1,2 @@
-b4786719f5669a238a836da187ed0115  emacs-24.0.97.tar.gz
+07c36f4e3fa3394ae5a6b513800bc976  emacs-24.1-rc.tar.gz
 d9a1e06bb579950c58fd3c1d8e813ce6  php-mode.el