fix #489066
This commit is contained in:
parent
87babc59db
commit
b5705b2cc5
|
@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
|
||||||
Name: emacs
|
Name: emacs
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 22.3
|
Version: 22.3
|
||||||
Release: 9%{?dist}
|
Release: 10%{?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
|
||||||
|
@ -28,6 +28,7 @@ Patch0: glibc-open-macro.patch
|
||||||
Patch1: rpm-spec-mode.patch
|
Patch1: rpm-spec-mode.patch
|
||||||
Patch2: po-mode-auto-replace-date-71264.patch
|
Patch2: po-mode-auto-replace-date-71264.patch
|
||||||
Patch3: rpm-spec-mode-utc.patch
|
Patch3: rpm-spec-mode-utc.patch
|
||||||
|
Patch4: emacsclient.patch
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||||
BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
|
BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-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
|
||||||
|
@ -110,6 +111,7 @@ Emacs packages or see some elisp examples.
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .glibc-open-macro
|
%patch0 -p1 -b .glibc-open-macro
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
# install rest of site-lisp files
|
# install rest of site-lisp files
|
||||||
( cd site-lisp
|
( cd site-lisp
|
||||||
|
@ -361,6 +363,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
||||||
%dir %{_datadir}/emacs/%{version}
|
%dir %{_datadir}/emacs/%{version}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 27 2009 Daniel Novotny <dnovotny@redhat.com> 1:22.3-10
|
||||||
|
- fix segfaults when emacsclient connects to a tcp emacs server (#489066)
|
||||||
|
|
||||||
* Thu Mar 12 2009 Daniel Novotny <dnovotny@redhat.com> 1:22.3-9
|
* Thu Mar 12 2009 Daniel Novotny <dnovotny@redhat.com> 1:22.3-9
|
||||||
- implement UTC change log option in rpm-spec-mode.el (#489829)
|
- implement UTC change log option in rpm-spec-mode.el (#489829)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
*** emacs-22.3/lib-src/emacsclient.c~ 2007-02-16 09:12:59.000000000 -0800
|
||||||
|
--- emacs-22.3/lib-src/emacsclient.c 2009-03-05 15:42:53.000000000 -0800
|
||||||
|
***************
|
||||||
|
*** 48,53 ****
|
||||||
|
--- 48,54 ----
|
||||||
|
|
||||||
|
# ifdef HAVE_INET_SOCKETS
|
||||||
|
# include <netinet/in.h>
|
||||||
|
+ # include <arpa/inet.h>
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# define INVALID_SOCKET -1
|
Loading…
Reference in New Issue