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

Removed patch glibc-open-macro, which seems to be no longer necessary

Browse Source
This commit is contained in:
Karel Klic 2012-09-14 11:46:23 +02:00
parent 68a9eb0779
commit ad2b01fd98
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emacs.spec
View File

@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 24.2 Version: 24.2
Release: 2%{?dist} Release: 3%{?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
@ -19,13 +19,12 @@ Source18: default.el
# Emacs Terminal Mode, #551949, #617355 # Emacs Terminal Mode, #551949, #617355
Source19: emacs-terminal.desktop Source19: emacs-terminal.desktop
Source20: emacs-terminal.sh Source20: emacs-terminal.sh
Patch0: glibc-open-macro.patch
Patch1: rpm-spec-mode.patch Patch1: rpm-spec-mode.patch
Patch2: rpm-spec-mode-utc.patch Patch2: rpm-spec-mode-utc.patch
Patch3: rpm-spec-mode-changelog.patch Patch3: rpm-spec-mode-changelog.patch
# rhbz#713600 # rhbz#713600
Patch7: emacs-spellchecker.patch Patch7: emacs-spellchecker.patch
# rhbz#830162 # rhbz#830162, fixed in org-mode upstream
Patch8: emacs-locate-library.patch Patch8: emacs-locate-library.patch
BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel BuildRequires: atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel glibc-devel libpng-devel
@ -46,6 +45,7 @@ BuildRequires: util-linux
%endif %endif
# Emacs doesn't run without xorg-x11-fonts-misc, rhbz#732422 # Emacs doesn't run without xorg-x11-fonts-misc, rhbz#732422
# We should consider depending on some other font!
Requires: desktop-file-utils xorg-x11-fonts-misc Requires: desktop-file-utils xorg-x11-fonts-misc
Requires(preun): %{_sbindir}/alternatives Requires(preun): %{_sbindir}/alternatives
Requires(posttrans): %{_sbindir}/alternatives Requires(posttrans): %{_sbindir}/alternatives
@ -153,7 +153,6 @@ packages that add functionality to Emacs.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .glibc-open-macro
%patch7 -p1 -b .spellchecker %patch7 -p1 -b .spellchecker
%patch8 -p1 -b .locate-library %patch8 -p1 -b .locate-library
@ -445,6 +444,9 @@ update-desktop-database &> /dev/null || :
%dir %{_datadir}/emacs/site-lisp/site-start.d %dir %{_datadir}/emacs/site-lisp/site-start.d
%changelog %changelog
* Fri Sep 14 2012 Karel Klíč <kklic@redhat.com> - 1:24.2-3
- Removed patch glibc-open-macro, which seems to be no longer necessary
* Thu Sep 13 2012 Karel Klíč <kklic@redhat.com> - 1:24.2-2 * Thu Sep 13 2012 Karel Klíč <kklic@redhat.com> - 1:24.2-2
- Removed focus-init.el which used to set focus-follows-mouse to nil. - Removed focus-init.el which used to set focus-follows-mouse to nil.
It is set to nil by default in Emacs 24.2. It is set to nil by default in Emacs 24.2.

11
glibc-open-macro.patch
View File

@ -1,11 +0,0 @@
--- emacs-22.1/src/sound.c~ 2007-03-06 07:14:14.000000000 -0500
+++ emacs-22.1/src/sound.c 2007-08-09 15:54:52.117018000 -0400
@@ -1469,7 +1469,7 @@ Internal use only, use `play-sound' inst
error ("No usable sound device driver found");
/* Open the device. */
- current_sound_device->open (current_sound_device);
+ (current_sound_device->open) (current_sound_device);
/* Play the sound. */
current_sound->play (current_sound, current_sound_device);