rpms/emacs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into f17

Browse Source
This commit is contained in:
Karel Klic 2012-06-18 18:27:17 +02:00
commit 064dd3225f
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

15
emacs.spec
View File

@ -3,12 +3,11 @@ Summary: GNU Emacs text editor
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 24.1 Version: 24.1
Release: 0.rc1%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/emacs/ URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors Group: Applications/Editors
#Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2 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
Source1: emacs.desktop Source1: emacs.desktop
Source2: emacsclient.desktop Source2: emacsclient.desktop
Source3: dotemacs.el Source3: dotemacs.el
@ -30,7 +29,7 @@ Patch3: rpm-spec-mode-changelog.patch
# rhbz#713600 # rhbz#713600
Patch7: emacs-spellchecker.patch 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: 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: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel, gnutls-devel
BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel, ImageMagick-devel, libselinux-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 # We patch configure.in so we have to do this
autoconf autoconf
# Build GTK+2 binary # Build GTK+3 binary
mkdir build-gtk && cd build-gtk mkdir build-gtk && cd build-gtk
ln -s ../configure . ln -s ../configure .
%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ %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 --with-wide-int
make bootstrap make bootstrap
%{setarch} make %{?_smp_mflags} %{setarch} make %{?_smp_mflags}
@ -434,6 +433,10 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d %dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog %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 * Fri Jun 8 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-0.rc1
- New upstream prerelease - New upstream prerelease
- Cleanup of the %%changelog section - Cleanup of the %%changelog section

2
sources
View File

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