From a6b036a939c360a275d0180fe8eb070e189ff89e Mon Sep 17 00:00:00 2001 From: Charles Coldwell Date: Mon, 19 Nov 2007 22:40:50 +0000 Subject: [PATCH] pulled sources from GNU CVS --- .cvsignore | 2 +- emacs.spec | 13 +++++-------- sources | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 841698b..815b710 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -emacs-22.1.tar.gz +emacs-22.1.50.tar.gz php-mode-1.2.0.tgz diff --git a/emacs.spec b/emacs.spec index fa25a57..7b8c530 100644 --- a/emacs.spec +++ b/emacs.spec @@ -2,8 +2,8 @@ Summary: GNU Emacs text editor Name: emacs -Version: 22.1 -Release: 9%{?dist} +Version: 22.1.50 +Release: 1%{?dist} License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -100,7 +100,6 @@ Emacs packages or see some elisp examples. %prep %setup -q %patch0 -p1 -b .glibc-open-macro -%patch1 -p0 -b .files-el # install rest of site-lisp files ( cd site-lisp @@ -122,11 +121,6 @@ rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES %build export CFLAGS="-DMAIL_USE_LOCKF -DSYSTEM_PURESIZE_EXTRA=16777216 $RPM_OPT_FLAGS" -# stack-protector causes crashing on i386 (#174730) -%ifarch %{ix86} -CFLAGS=`echo $CFLAGS | sed -e "s/ -fstack-protector//"` -%endif - %configure --with-pop --with-sound --with-gtk %__make bootstrap @@ -298,6 +292,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %dir %{_datadir}/emacs/%{version} %changelog +* Mon Nov 19 2007 Chip Coldwell 22.1.50-1 +- pulled sources from GNU CVS + * Mon Nov 19 2007 Chip Coldwell 22.1-9 - fixup alternatives mess (bz239745, bz246540) diff --git a/sources b/sources index 7789793..2537dbe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6949df37caec2d7a2e0eee3f1b422726 emacs-22.1.tar.gz +5e24fb97b11d9952a0985b4ded11cbd9 emacs-22.1.50.tar.gz c4ee5e37db3921d6a9aa6d7c417ccadb php-mode-1.2.0.tgz