Merge branch 'master' into f17

.gitignore

@@ -6,3 +6,4 @@
 /emacs-24.0.95.tar.gz
 /emacs-24.0.97.tar.gz
 /emacs-24.1-rc.tar.gz
+/emacs-24.1.tar.bz2

emacs.spec

@@ -3,12 +3,11 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 24.1
-Release: 0.rc1%{?dist}
+Release: 1%{?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-24.1-rc.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2
 Source1: emacs.desktop
 Source2: emacsclient.desktop
 Source3: dotemacs.el
@@ -30,7 +29,7 @@ Patch3: rpm-spec-mode-changelog.patch
 # rhbz#713600
 Patch7: emacs-spellchecker.patch
 
-BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
+BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk3-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel, gnutls-devel
 BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel, ImageMagick-devel, libselinux-devel
@@ -201,12 +200,12 @@ export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
 # We patch configure.in so we have to do this
 autoconf
 
-# Build GTK+2 binary
+# Build GTK+3 binary
 mkdir build-gtk && cd build-gtk
 ln -s ../configure .
 
 %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
-           --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk --with-gpm=no \
+           --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
 	   --with-wide-int
 make bootstrap
 %{setarch} make %{?_smp_mflags}
@@ -434,6 +433,10 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Mon Jun 18 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-1
+- New upstream release
+- Switch from GTK 2 to GTK 3
+
 * Fri Jun  8 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-0.rc1
 - New upstream prerelease
 - Cleanup of the %%changelog section

sources

@@ -1,2 +1,2 @@
-07c36f4e3fa3394ae5a6b513800bc976  emacs-24.1-rc.tar.gz
+8ba0932c498bc8fb10d7ddba52227e5b  emacs-24.1.tar.bz2
 d9a1e06bb579950c58fd3c1d8e813ce6  php-mode.el