Compare commits
13 Commits
Author | SHA1 | Date |
---|---|---|
|
ee49ae6e3c | |
|
9a9d09c9ab | |
|
b17d0bd2b2 | |
|
8840693f1d | |
|
a2f1208947 | |
|
b4de478d43 | |
|
142673d33f | |
|
6ca2ad7af2 | |
|
c7daabd467 | |
|
1c8ac21b38 | |
|
b6e98d7ec3 | |
|
52488316fa | |
|
582e40cd8c |
|
@ -1,3 +0,0 @@
|
||||||
emacs-22.1.50.tar.gz
|
|
||||||
php-mode-1.2.0.tgz
|
|
||||||
emacs-23.0.60.tar.gz
|
|
|
@ -0,0 +1 @@
|
||||||
|
emacs-22.2.tar.gz
|
|
@ -0,0 +1 @@
|
||||||
|
Emacs*font: -adobe-courier-medium-r-*-*-12-120-75-75-*-*-*-*
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
||||||
# Makefile for source rpm: emacs
|
|
||||||
# $Id: Makefile,v 1.1 2004/09/09 04:30:11 cvsdist Exp $
|
|
||||||
NAME := emacs
|
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
|
||||||
|
|
||||||
define find-makefile-common
|
|
||||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
|
||||||
|
|
||||||
ifeq ($(MAKEFILE_COMMON),)
|
|
||||||
# attempt a checkout
|
|
||||||
define checkout-makefile-common
|
|
||||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(MAKEFILE_COMMON)
|
|
|
@ -0,0 +1,55 @@
|
||||||
|
for src/ChangeLog
|
||||||
|
from Alexandre Oliva <aoliva@redhat.com>
|
||||||
|
|
||||||
|
* regex.c (MOVE_BUFFER_POINTER, EXTEND_BUFFER): Don't compute
|
||||||
|
offsets between unrelated pointers.
|
||||||
|
|
||||||
|
--- emacs-22.1.50.orig/src/regex.c 2007-09-10 15:46:20.000000000 -0300
|
||||||
|
+++ emacs-22.1.50/src/regex.c 2008-03-22 08:07:06.000000000 -0300
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
internationalization features.)
|
||||||
|
|
||||||
|
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||||
|
- 2002, 2003, 2004, 2005, 2006, 2007
|
||||||
|
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||||
|
Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
@@ -1832,8 +1832,10 @@
|
||||||
|
being larger than MAX_BUF_SIZE, then flag memory exhausted. */
|
||||||
|
#if __BOUNDED_POINTERS__
|
||||||
|
# define SET_HIGH_BOUND(P) (__ptrhigh (P) = __ptrlow (P) + bufp->allocated)
|
||||||
|
-# define MOVE_BUFFER_POINTER(P) \
|
||||||
|
- (__ptrlow (P) += incr, SET_HIGH_BOUND (P), __ptrvalue (P) += incr)
|
||||||
|
+# define MOVE_BUFFER_POINTER(P) \
|
||||||
|
+ (__ptrlow (P) = new_buffer + (__ptrlow (P) - old_buffer), \
|
||||||
|
+ SET_HIGH_BOUND (P), \
|
||||||
|
+ __ptrvalue (P) = new_buffer + (__ptrvalue (P) - old_buffer))
|
||||||
|
# define ELSE_EXTEND_BUFFER_HIGH_BOUND \
|
||||||
|
else \
|
||||||
|
{ \
|
||||||
|
@@ -1847,12 +1849,12 @@
|
||||||
|
SET_HIGH_BOUND (pending_exact); \
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
-# define MOVE_BUFFER_POINTER(P) (P) += incr
|
||||||
|
+# define MOVE_BUFFER_POINTER(P) ((P) = new_buffer + ((P) - old_buffer))
|
||||||
|
# define ELSE_EXTEND_BUFFER_HIGH_BOUND
|
||||||
|
#endif
|
||||||
|
#define EXTEND_BUFFER() \
|
||||||
|
do { \
|
||||||
|
- re_char *old_buffer = bufp->buffer; \
|
||||||
|
+ unsigned char *old_buffer = bufp->buffer; \
|
||||||
|
if (bufp->allocated == MAX_BUF_SIZE) \
|
||||||
|
return REG_ESIZE; \
|
||||||
|
bufp->allocated <<= 1; \
|
||||||
|
@@ -1864,7 +1866,7 @@
|
||||||
|
/* If the buffer moved, move all the pointers into it. */ \
|
||||||
|
if (old_buffer != bufp->buffer) \
|
||||||
|
{ \
|
||||||
|
- int incr = bufp->buffer - old_buffer; \
|
||||||
|
+ unsigned char *new_buffer = bufp->buffer; \
|
||||||
|
MOVE_BUFFER_POINTER (b); \
|
||||||
|
MOVE_BUFFER_POINTER (begalt); \
|
||||||
|
if (fixup_alt_jump) \
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
--- emacs-22.1.50/src/m/sparc.h.old 2008-02-11 01:26:36.000000000 -0600
|
||||||
|
+++ emacs-22.1.50/src/m/sparc.h 2008-02-11 09:12:09.000000000 -0600
|
||||||
|
@@ -93,6 +93,19 @@
|
||||||
|
|
||||||
|
#ifdef __arch64__ /* GCC, 64-bit ABI. */
|
||||||
|
#define BITS_PER_LONG 64
|
||||||
|
+#ifdef __linux__
|
||||||
|
+#undef START_FILES
|
||||||
|
+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
|
||||||
|
+
|
||||||
|
+/* The duplicate -lgcc is intentional in the definition of LIB_STANDARD.
|
||||||
|
+ The reason is that some functions in libgcc.a call functions from libc.a,
|
||||||
|
+ and some libc.a functions need functions from libgcc.a. Since most
|
||||||
|
+ versions of ld are one-pass linkers, we need to mention -lgcc twice,
|
||||||
|
+ or else we risk getting unresolved externals. */
|
||||||
|
+#undef LIB_STANDARD
|
||||||
|
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#ifndef _LP64
|
||||||
|
#define _LP64 /* Done on Alpha -- not sure if it
|
||||||
|
should be here. -- fx */
|
139
emacs.spec
139
emacs.spec
|
@ -2,36 +2,46 @@
|
||||||
|
|
||||||
Summary: GNU Emacs text editor
|
Summary: GNU Emacs text editor
|
||||||
Name: emacs
|
Name: emacs
|
||||||
Version: 23.0.60
|
Epoch: 1
|
||||||
Release: 2%{?dist}
|
Version: 22.2
|
||||||
License: GPL
|
Release: 5%{?dist}
|
||||||
|
License: GPLv3+
|
||||||
URL: http://www.gnu.org/software/emacs/
|
URL: http://www.gnu.org/software/emacs/
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.gz
|
Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz
|
||||||
Source1: emacs.desktop
|
Source1: emacs.desktop
|
||||||
|
Source2: Emacs
|
||||||
Source3: dotemacs.el
|
Source3: dotemacs.el
|
||||||
Source4: site-start.el
|
Source4: site-start.el
|
||||||
Source6: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el
|
Source6: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el
|
||||||
Source7: http://download.sourceforge.net/php-mode/php-mode-1.2.0.tgz
|
Source7: http://php-mode.svn.sourceforge.net/svnroot/php-mode/tags/php-mode-1.4.0/php-mode.el
|
||||||
Source8: php-mode-init.el
|
Source8: php-mode-init.el
|
||||||
Source9: ssl.el
|
Source9: ssl.el
|
||||||
Source11: rpm-spec-mode-init.el
|
Source11: rpm-spec-mode-init.el
|
||||||
Source13: focus-init.el
|
Source13: focus-init.el
|
||||||
Source14: po-mode.el
|
Source14: po-mode.el
|
||||||
Source15: po-mode-init.el
|
Source15: po-mode-init.el
|
||||||
Source16: po-mode-auto-replace-date-71264.patch
|
|
||||||
Source18: default.el
|
Source18: default.el
|
||||||
Source19: wrapper
|
|
||||||
Source20: igrep.el
|
Source20: igrep.el
|
||||||
Source21: igrep-init.el
|
Source21: igrep-init.el
|
||||||
Patch0: glibc-open-macro.patch
|
Patch0: glibc-open-macro.patch
|
||||||
|
Patch1: rpm-spec-mode.patch
|
||||||
|
Patch2: po-mode-auto-replace-date-71264.patch
|
||||||
|
Patch3: emacs-22.1.50-sparc64.patch
|
||||||
|
Patch4: emacs-22.1.50-regex.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, dbus-devel, freetype-devel
|
||||||
BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
|
BuildRequires: fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel
|
||||||
BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel
|
BuildRequires: libpng-devel, libjpeg-devel, librsvg2-devel, libtiff-devel,
|
||||||
BuildRequires: autoconf, automake, bzip2, cairo, texinfo
|
BuildRequires: libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel
|
||||||
Requires: xorg-x11-fonts-ISO8859-1-100dpi
|
BuildRequires: libXt-devel, libXpm-devel, m17n-lib-devel, ncurses-devel
|
||||||
Requires: emacs-common = %{version}-%{release}
|
BuildRequires: xorg-x11-proto-devel, zlib-devel
|
||||||
|
BuildRequires: texinfo >= 4.6
|
||||||
|
%ifarch %{ix86}
|
||||||
|
BuildRequires: setarch
|
||||||
|
%endif
|
||||||
|
Requires: xorg-x11-fonts-75dpi
|
||||||
|
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||||
Conflicts: gettext < 0.10.40
|
Conflicts: gettext < 0.10.40
|
||||||
Provides: emacs(bin)
|
Provides: emacs(bin)
|
||||||
|
|
||||||
|
@ -56,7 +66,7 @@ This package provides an emacs binary with support for X windows.
|
||||||
%package nox
|
%package nox
|
||||||
Summary: GNU Emacs text editor without X support
|
Summary: GNU Emacs text editor without X support
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
Requires: emacs-common = %{version}-%{release}
|
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||||
Provides: emacs(bin)
|
Provides: emacs(bin)
|
||||||
|
|
||||||
%description nox
|
%description nox
|
||||||
|
@ -98,13 +108,17 @@ 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
|
||||||
|
%patch3 -p1 -b .sparc64-libdir
|
||||||
|
%patch4 -p1 -b .regexp
|
||||||
|
|
||||||
# install rest of site-lisp files
|
# install rest of site-lisp files
|
||||||
( cd site-lisp
|
( ! [ -d site-lisp ] && mkdir site-lisp
|
||||||
cp %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
|
cd site-lisp
|
||||||
tar xfz %SOURCE7 # php-mode
|
cp %SOURCE6 %SOURCE7 %SOURCE9 %SOURCE14 %SOURCE20 .
|
||||||
|
# rpm-spec-mode can use compilation-mode
|
||||||
|
patch < %PATCH1
|
||||||
# fix po-auto-replace-revision-date nil
|
# fix po-auto-replace-revision-date nil
|
||||||
patch < %SOURCE16 )
|
patch < %PATCH2 )
|
||||||
|
|
||||||
# we prefer our emacs.desktop file
|
# we prefer our emacs.desktop file
|
||||||
cp %SOURCE1 etc/emacs.desktop
|
cp %SOURCE1 etc/emacs.desktop
|
||||||
|
@ -118,13 +132,20 @@ rm -f lisp/play/tetris.el lisp/play/tetris.elc
|
||||||
rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES
|
rm -f etc/sex.6 etc/condom.1 etc/celibacy.1 etc/COOKIES etc/future-bug etc/JOKES
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Turn off address space randomization for the dumper. The dumper
|
||||||
|
# tries to detect randomization and turn it off, but the heuristics
|
||||||
|
# don't work reliably.
|
||||||
|
%ifarch %{ix86}
|
||||||
|
%define setarch setarch %{_arch} -R
|
||||||
|
%else
|
||||||
|
%define setarch %{nil}
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
|
CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" %configure --with-x-toolkit=gtk --with-sound --with-toolkit-scroll-bars
|
||||||
|
|
||||||
%configure --with-pop --with-sound --with-x-toolkit=gtk --enable-font-backend
|
%{setarch} %__make bootstrap
|
||||||
|
%{setarch} %__make %{?_smp_mflags}
|
||||||
%__make bootstrap
|
|
||||||
%__make %{?_smp_mflags}
|
|
||||||
|
|
||||||
# remove versioned file so that we end up with .1 suffix and only one DOC file
|
# remove versioned file so that we end up with .1 suffix and only one DOC file
|
||||||
rm src/emacs-%{version}.*
|
rm src/emacs-%{version}.*
|
||||||
|
@ -135,7 +156,8 @@ TOPDIR=${PWD}
|
||||||
# make sure patched lisp files get byte-compiled
|
# make sure patched lisp files get byte-compiled
|
||||||
%emacsbatch -f batch-byte-compile site-lisp/*.el
|
%emacsbatch -f batch-byte-compile site-lisp/*.el
|
||||||
|
|
||||||
%__make %{?_smp_mflags} -C lisp updates
|
# This seems to have issue with smp_mflags. :/
|
||||||
|
%__make -C lisp updates
|
||||||
|
|
||||||
# Create pkgconfig file
|
# Create pkgconfig file
|
||||||
cat > emacs.pc << EOF
|
cat > emacs.pc << EOF
|
||||||
|
@ -144,7 +166,7 @@ sitestartdir=%{site_lisp}/site-start.d
|
||||||
|
|
||||||
Name: emacs
|
Name: emacs
|
||||||
Description: GNU Emacs text editor
|
Description: GNU Emacs text editor
|
||||||
Version: %{version}
|
Version: %{epoch}:%{version}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
@ -171,11 +193,24 @@ mkdir -p %{buildroot}%{site_lisp}
|
||||||
install -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
|
install -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el
|
||||||
install -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
|
install -m 0644 %SOURCE18 %{buildroot}%{site_lisp}
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/X11/app-defaults
|
||||||
|
install -m 0644 %SOURCE2 %{buildroot}%{_datadir}/X11/app-defaults
|
||||||
|
|
||||||
mv %{buildroot}%{_bindir}/{etags,etags.emacs}
|
mv %{buildroot}%{_bindir}/{etags,etags.emacs}
|
||||||
mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
|
mv %{buildroot}%{_mandir}/man1/{ctags.1,gctags.1}
|
||||||
mv %{buildroot}%{_mandir}/man1/{etags.1,etags.emacs.1}
|
mv %{buildroot}%{_mandir}/man1/{etags.1,etags.emacs.1}
|
||||||
mv %{buildroot}%{_bindir}/{ctags,gctags}
|
mv %{buildroot}%{_bindir}/{ctags,gctags}
|
||||||
|
|
||||||
|
# GNOME / KDE files
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/applications
|
||||||
|
install -m 0644 %SOURCE1 %{buildroot}%{_datadir}/applications/emacs.desktop
|
||||||
|
for i in 16 24 32 48
|
||||||
|
do
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
|
||||||
|
install -m 0644 %{buildroot}%{_datadir}/emacs/%{version}/etc/images/icons/emacs_${i}.png \
|
||||||
|
%{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/emacs.png
|
||||||
|
done
|
||||||
|
|
||||||
# install site-lisp files
|
# install site-lisp files
|
||||||
install -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
|
install -m 0644 site-lisp/*.el{,c} %{buildroot}%{site_lisp}
|
||||||
|
|
||||||
|
@ -224,11 +259,23 @@ alternatives --remove emacs %{_bindir}/emacs-%{version} || :
|
||||||
%posttrans
|
%posttrans
|
||||||
alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 || :
|
alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 || :
|
||||||
|
|
||||||
|
%post
|
||||||
|
touch --no-create %{_datadir}/icons/hicolor
|
||||||
|
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
||||||
|
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||||
|
fi
|
||||||
|
|
||||||
%preun nox
|
%preun nox
|
||||||
alternatives --remove emacs %{_bindir}/emacs-%{version}-nox || :
|
alternatives --remove emacs %{_bindir}/emacs-%{version}-nox || :
|
||||||
|
|
||||||
%posttrans nox
|
%posttrans nox
|
||||||
alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 || :
|
alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70
|
||||||
|
|
||||||
|
%postun
|
||||||
|
touch --no-create %{_datadir}/icons/hicolor
|
||||||
|
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
||||||
|
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||||
|
fi
|
||||||
|
|
||||||
%post common
|
%post common
|
||||||
for f in %{info_files}; do
|
for f in %{info_files}; do
|
||||||
|
@ -254,7 +301,8 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
||||||
%dir %{_libexecdir}/emacs/%{version}
|
%dir %{_libexecdir}/emacs/%{version}
|
||||||
%dir %{emacs_libexecdir}
|
%dir %{emacs_libexecdir}
|
||||||
%{_datadir}/applications/emacs.desktop
|
%{_datadir}/applications/emacs.desktop
|
||||||
%{_datadir}/icons/hicolor/*/apps/emacs*.png
|
%{_datadir}/icons/hicolor/*/apps/emacs.png
|
||||||
|
%{_datadir}/X11/app-defaults/Emacs
|
||||||
|
|
||||||
%files nox
|
%files nox
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
@ -286,6 +334,43 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
||||||
%dir %{_datadir}/emacs/%{version}
|
%dir %{_datadir}/emacs/%{version}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 23 2008 Chip Coldwell <coldwell@redhat.com> 1:22.2-5
|
||||||
|
- drop the old icon in favor of the new set from FSF, and rebuild the gtk
|
||||||
|
icon cache in the post and postun scriptlets.
|
||||||
|
- add /usr/share/X11/app-defaults/Emacs and xorg-x11-fonts-75dpi dependency
|
||||||
|
to get sane screen display font
|
||||||
|
- update to php-mode 1.4
|
||||||
|
- drop the wrapper script; we use alternatives for better or worse now
|
||||||
|
- patch rpm-spec-mode to use a real compilation mode
|
||||||
|
- bring back setarch -R ... the dumper tries to detect address space
|
||||||
|
randomization and compensate on its own, but the heuristics aren't 100%
|
||||||
|
- drop the files.el patch; this is now in the upstream tarball
|
||||||
|
- don't use smp_mflags on second make invocation
|
||||||
|
|
||||||
|
* Thu May 01 2008 Tom "spot" Callaway <tcallawa@redhat.com>
|
||||||
|
- fix requires to include epoch
|
||||||
|
|
||||||
|
* Thu May 01 2008 Dennis Gilmore <dennis@ausil.us> 1:22.2-4
|
||||||
|
- add patch from bz#435767
|
||||||
|
|
||||||
|
* Thu May 01 2008 Dennis Gilmore <dennis@ausil.us> 1:22.2-3
|
||||||
|
- add epoch
|
||||||
|
- put epoch in .pc file
|
||||||
|
|
||||||
|
* Thu Apr 24 2008 Dennis Gilmore <dennis@ausil.us> 22.2-2
|
||||||
|
- add patch fixing libdir on sparc64
|
||||||
|
|
||||||
|
* Tue Apr 22 2008 Chip Coldwell <coldwell@redhat.com> 22.2-1
|
||||||
|
- revert back to emacs-22.2 (bz443639)
|
||||||
|
- update to php-mode-1.4.0
|
||||||
|
- update to rpm-spec-mode.el v0.12.1x (bz432209)
|
||||||
|
- patch rpm-spec-mode to use compilation mode (bz227418)
|
||||||
|
- fix the Release tag (bz440624)
|
||||||
|
- drop superfluous configure options
|
||||||
|
- move the new icons into the right destination directory
|
||||||
|
- the heuristics for detecting address space randomization in the emacs dumper
|
||||||
|
seem insufficient, so bring back setarch -R
|
||||||
|
|
||||||
* Fri Apr 18 2008 Chip Coldwell <coldwell@redhat.com> 23.0.60-2
|
* Fri Apr 18 2008 Chip Coldwell <coldwell@redhat.com> 23.0.60-2
|
||||||
- New upstream tarball (fixes bz435767)
|
- New upstream tarball (fixes bz435767)
|
||||||
- configure tweaks
|
- configure tweaks
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
description:
|
|
||||||
;;; files.el --- file input and output commands for Emacs
|
|
||||||
----------------------------
|
|
||||||
revision 1.938
|
|
||||||
date: 2007-11-02 11:03:42 +0000; author: rfrancoise; state: Exp; lines: +2 -2; commitid: wgxFxIhiWr3NtZDs;
|
|
||||||
2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change)
|
|
||||||
|
|
||||||
* files.el (hack-local-variables): Fix membership tests to avoid
|
|
||||||
treating all variables as safe if `enable-local-variables' is
|
|
||||||
set to :safe.
|
|
||||||
=============================================================================
|
|
||||||
Index: lisp/files.el
|
|
||||||
===================================================================
|
|
||||||
RCS file: /sources/emacs/emacs/lisp/files.el,v
|
|
||||||
retrieving revision 1.937
|
|
||||||
retrieving revision 1.938
|
|
||||||
diff -u -r1.937 -r1.938
|
|
||||||
--- lisp/files.el 26 Oct 2007 14:25:17 -0000 1.937
|
|
||||||
+++ lisp/files.el 2 Nov 2007 11:03:42 -0000 1.938
|
|
||||||
@@ -2821,8 +2821,8 @@
|
|
||||||
;; If caller wants only the safe variables,
|
|
||||||
;; install only them.
|
|
||||||
(dolist (elt result)
|
|
||||||
- (unless (or (memq (car elt) unsafe-vars)
|
|
||||||
- (memq (car elt) risky-vars))
|
|
||||||
+ (unless (or (member elt unsafe-vars)
|
|
||||||
+ (member elt risky-vars))
|
|
||||||
(hack-one-local-variable (car elt) (cdr elt))))
|
|
||||||
;; Query, except in the case where all are known safe
|
|
||||||
;; if the user wants no quuery in that case.
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,4 +1,4 @@
|
||||||
;; rpm-spec-mode for spec files
|
;; rpm-spec-mode for spec files
|
||||||
|
|
||||||
(autoload 'rpm-spec-mode "rpm-spec-mode" "RPM spec mode." t)
|
(autoload 'rpm-spec-mode "rpm-spec-mode" "RPM spec mode." t)
|
||||||
(add-to-list 'auto-mode-alist '("\\.spec$" . rpm-spec-mode))
|
(add-to-list 'auto-mode-alist '("\\.spec\\(\\.in\\)?$" . rpm-spec-mode))
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
(defconst rpm-spec-mode-version "0.12x" "Version of `rpm-spec-mode'.")
|
(defconst rpm-spec-mode-version "0.12.1x" "Version of `rpm-spec-mode'.")
|
||||||
|
|
||||||
(defgroup rpm-spec nil
|
(defgroup rpm-spec nil
|
||||||
"RPM spec mode with Emacs/XEmacs enhancements."
|
"RPM spec mode with Emacs/XEmacs enhancements."
|
||||||
|
@ -1233,14 +1233,17 @@ command."
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(goto-char (point-min))
|
(goto-char (point-min))
|
||||||
(if (search-forward-regexp
|
(if (search-forward-regexp
|
||||||
"^\\(Release[ \t]*:[ \t]*\\)\\([0-9]+\\)\\(.*\\)" nil t)
|
;; Try to find the last digit-only group of a dot-separated release string
|
||||||
(let ((release (1+ (string-to-int (match-string 2)))))
|
(concat "^\\(Release[ \t]*:[ \t]*\\)"
|
||||||
(setq release (concat (int-to-string release) (match-string 3)))
|
"\\(.*[ \t\\.}]\\)\\([0-9]+\\)\\([ \t\\.%].*\\|$\\)") nil t)
|
||||||
|
(let ((release (1+ (string-to-int (match-string 3)))))
|
||||||
|
(setq release
|
||||||
|
(concat (match-string 2) (int-to-string release) (match-string 4)))
|
||||||
(replace-match (concat (match-string 1) release))
|
(replace-match (concat (match-string 1) release))
|
||||||
(message "Release tag changed to %s." release))
|
(message "Release tag changed to %s." release))
|
||||||
(if (search-forward-regexp "^Release[ \t]*:[ \t]*%{?\\([^}]*\\)}?$" nil t)
|
(if (search-forward-regexp "^Release[ \t]*:[ \t]*%{?\\([^}]*\\)}?$" nil t)
|
||||||
(rpm-increase-release-with-macros)
|
(rpm-increase-release-with-macros)
|
||||||
(message "No Release tag found...")))))
|
(message "No Release tag to increase found...")))))
|
||||||
|
|
||||||
;;------------------------------------------------------------
|
;;------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,91 @@
|
||||||
|
--- rpm-spec-mode.el~ 2008-04-22 15:14:40.000000000 -0400
|
||||||
|
+++ rpm-spec-mode.el 2008-04-22 16:19:09.000000000 -0400
|
||||||
|
@@ -63,7 +63,9 @@
|
||||||
|
|
||||||
|
;;; Code:
|
||||||
|
|
||||||
|
-(defconst rpm-spec-mode-version "0.12.1x" "Version of `rpm-spec-mode'.")
|
||||||
|
+(require 'compile)
|
||||||
|
+
|
||||||
|
+(defconst rpm-spec-mode-version "0.12.1x.rh1" "Version of `rpm-spec-mode'.")
|
||||||
|
|
||||||
|
(defgroup rpm-spec nil
|
||||||
|
"RPM spec mode with Emacs/XEmacs enhancements."
|
||||||
|
@@ -189,11 +191,6 @@
|
||||||
|
:type 'boolean
|
||||||
|
:group 'rpm-spec)
|
||||||
|
|
||||||
|
-(defcustom rpm-spec-use-compilation-mode t
|
||||||
|
- "*If non-nil, build in `compilation-mode' if it's available."
|
||||||
|
- :type 'boolean
|
||||||
|
- :group 'rpm-spec)
|
||||||
|
-
|
||||||
|
(defcustom rpm-spec-default-release "1"
|
||||||
|
"*Default value for the Release tag in new spec files."
|
||||||
|
:type 'string
|
||||||
|
@@ -225,6 +222,11 @@
|
||||||
|
:type 'string
|
||||||
|
:group 'rpm-spec)
|
||||||
|
|
||||||
|
+(defcustom rpm-spec-auto-topdir nil
|
||||||
|
+ "*Automatically detect an rpm build directory tree and define _topdir."
|
||||||
|
+ :type 'boolean
|
||||||
|
+ :group 'rpm-spec)
|
||||||
|
+
|
||||||
|
(defgroup rpm-spec-faces nil
|
||||||
|
"Font lock faces for `rpm-spec-mode'."
|
||||||
|
:prefix "rpm-spec-"
|
||||||
|
@@ -1025,20 +1027,30 @@
|
||||||
|
(setq buildoptions (cons "--nodeps" buildoptions)))
|
||||||
|
(if (and rpm-spec-sign-gpg (not rpm-no-gpg))
|
||||||
|
(setq buildoptions (cons "--sign" buildoptions)))
|
||||||
|
- (save-excursion
|
||||||
|
- (set-buffer (get-buffer rpm-buffer-name))
|
||||||
|
- (and rpm-spec-use-compilation-mode
|
||||||
|
- (fboundp 'compilation-mode)
|
||||||
|
- (compilation-mode))
|
||||||
|
- (goto-char (point-max)))
|
||||||
|
- (let* ((process-environment (cons "EMACS=t" process-environment))
|
||||||
|
- (process
|
||||||
|
- (apply 'start-process rpm-spec-build-command rpm-buffer-name
|
||||||
|
- rpm-spec-build-command buildoptions)))
|
||||||
|
- (if (and rpm-spec-sign-gpg (not rpm-no-gpg))
|
||||||
|
- (let ((rpm-passwd-cache (read-passwd "GPG passphrase: ")))
|
||||||
|
- (process-send-string process (concat rpm-passwd-cache "\n"))))
|
||||||
|
- (set-process-filter process 'rpm-command-filter)))
|
||||||
|
+
|
||||||
|
+ (if rpm-spec-auto-topdir
|
||||||
|
+ (if (string-match ".*/SPECS/$" default-directory)
|
||||||
|
+ (let ((topdir (expand-file-name default-directory)))
|
||||||
|
+ (setq buildoptions
|
||||||
|
+ (cons
|
||||||
|
+ (concat "--define \"_topdir "
|
||||||
|
+ (replace-regexp-in-string "/SPECS/$" "" topdir)
|
||||||
|
+ "\"")
|
||||||
|
+ buildoptions)))))
|
||||||
|
+
|
||||||
|
+ (progn
|
||||||
|
+ (defun list->string (lst)
|
||||||
|
+ (if (cdr lst)
|
||||||
|
+ (concat (car lst) " " (list->string (cdr lst)))
|
||||||
|
+ (car lst)))
|
||||||
|
+ (compilation-start (list->string (cons rpm-spec-build-command buildoptions)) 'rpmbuild-mode))
|
||||||
|
+
|
||||||
|
+ (if (and rpm-spec-sign-gpg (not rpm-no-gpg))
|
||||||
|
+ (let ((build-proc (get-buffer-process
|
||||||
|
+ (get-buffer
|
||||||
|
+ (compilation-buffer-name "rpmbuild" nil nil))))
|
||||||
|
+ (rpm-passwd-cache (read-passwd "GPG passphrase: ")))
|
||||||
|
+ (process-send-string build-proc (concat rpm-passwd-cache "\n")))))
|
||||||
|
|
||||||
|
(defun rpm-build-prepare (&optional arg)
|
||||||
|
"Run a `rpmbuild -bp'."
|
||||||
|
@@ -1409,5 +1421,8 @@
|
||||||
|
;;;###autoload(add-to-list 'auto-mode-alist '("\\.spec\\(\\.in\\)?$" . rpm-spec-mode))
|
||||||
|
|
||||||
|
(provide 'rpm-spec-mode)
|
||||||
|
+;;;###autoload
|
||||||
|
+(define-compilation-mode rpmbuild-mode "RPM build" ""
|
||||||
|
+ (set (make-local-variable 'compilation-disable-input) t))
|
||||||
|
|
||||||
|
;;; rpm-spec-mode.el ends here
|
3
sources
3
sources
|
@ -1,2 +1 @@
|
||||||
c4ee5e37db3921d6a9aa6d7c417ccadb php-mode-1.2.0.tgz
|
d6ee586b8752351334ebf072904c4d51 emacs-22.2.tar.gz
|
||||||
9f2ec87d44c1376ff1e259bfcddad70b emacs-23.0.60.tar.gz
|
|
||||||
|
|
Loading…
Reference in New Issue