diff --git a/.cvsignore b/.cvsignore index 67d54e0..0098ecf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ +elisp-manual-21-2.6.tar.bz2 emacs-20.7.tar.bz2 emacs-asian.tar.bz2 gnus-5.8.8.tar.bz2 diff --git a/emacs.spec b/emacs.spec index cde91e5..5a1855d 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,8 +1,8 @@ Summary: The libraries needed to run the GNU Emacs text editor. Name: emacs Version: 20.7 -Release: 34p -Copyright: GPL +Release: 40 +License: GPL Group: Applications/Editors Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.bz2 Source1: ftp://ftp.gnu.org/gnu/emacs/leim-%{version}.tar.bz2 @@ -13,11 +13,12 @@ Source6: site-start.el Source7: http://www.python.org/emacs/python-mode/python-mode.el # From /usr/X11R6/lib/X11/locale/locale.alias Source8: emacs.locale.alias -Source11: rpm-spec-mode.el +Source11: http://www.tihlde.org/~stigb/rpm-spec-mode.el Source12: mwheel.el Source13: lisp-startup-localealias.patch Source14: ftp://ftp.gnus.org/pub/gnus/gnus-5.8.8.tar.bz2 Source15: emacs-asian.tar.bz2 +Source16: ftp://ftp.gnu.org/gnus/emacs/elisp-manual-21-2.6.tar.bz2 Patch0: emacs-20.7-xaw3d.patch Patch2: emacs-20.3-tmprace.patch Patch3: emacs-20.3-linkscr.patch @@ -30,14 +31,15 @@ Patch9: emacs-20.6-ia64-3.patch Patch10: emacs-20.7-manboption.patch Patch11: emacs-20.7-proto.patch Patch12: emacs-cpp-Makefile.patch -Patch13: emacs-20.4-ppc-config.patch Patch50: emacs-20.7-s390.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/install-info +BuildRequires: Xaw3d-devel glibc-devel gcc XFree86-devel bzip2 ncurses-devel +BuildRequires: zlib-devel libpng-devel libjpeg-devel libungif-devel libtiff-devel # temporary hack. roll tamago into base emacs package -Requires: tamago +#Requires: tamago %description Emacs is a powerful, customizable, self-documenting, modeless text @@ -125,11 +127,7 @@ also need to install the emacs package in order to run Emacs. %patch11 -p1 %patch12 -p1 -%ifarch ppc -%patch13 -p1 -b .ppc -%endif - -%ifarch s390 +%ifarch s390 s390x %patch50 -p1 -b .s390 %endif @@ -264,6 +262,11 @@ rm -f $RPM_BUILD_ROOT/usr/bin/ctags rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/*ctags* rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/etc/ctags* +# The elisp reference manual +bzcat %{SOURCE16} | tar xf - +pushd elisp-manual-21-2.6 +install -m 644 elisp elisp-? elisp-?? $RPM_BUILD_ROOT/%{_infodir} +popd find $RPM_BUILD_ROOT/usr/share/emacs/%{version}/lisp \ -name '*.elc' -print | sed "s^$RPM_BUILD_ROOT^^" > core-filelist @@ -310,7 +313,7 @@ rm -rf $RPM_BUILD_ROOT rm -rf build-nox rm -rf build-withx -%define info_files ccmode cl dired-x ediff emacs forms gnus info message mh-e reftex sc vip viper widget +%define info_files ccmode cl dired-x ediff emacs forms gnus info message mh-e reftex sc vip viper widget elisp %post for f in %{info_files}; do /sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir --section="GNU Emacs" 2> /dev/null || : @@ -397,10 +400,31 @@ fi %defattr(-,root,root) %attr(755,root,root) /usr/bin/emacs %attr(755,root,root) /usr/bin/emacs-%{version} -%config /etc/X11/applnk/Applications/emacs.desktop +%config(noreplace) /etc/X11/applnk/Applications/emacs.desktop /usr/share/pixmaps/emacs.png %changelog +* Tue Jun 19 2001 Trond Eivind Glomsr�d +- Much cleaner site-start.d sourcing +- Add more build dependencies +- Add the emacs lisp reference info pages (RFE #44577) +- Don't require tamago - just plug it in for Japanese support + +* Mon Jun 18 2001 Trond Eivind Glomsr�d +- Add Xaw3d-devel to buildrequires (#44736) + +* Mon Jun 18 2001 Florian La Roche +- merged s390x patch from + +* Mon Jun 4 2001 Trond Eivind Glomsr�d +- New rpm-spec-mode.el, which fixes #43323 + +* Thu Apr 26 2001 Florian La Roche +- fix linker problem on s390 (fix by Than Ngo than@redhat.com) + +* Wed Apr 25 2001 Trond Eivind Glomsr�d +- Make sure that mwheel is initialized for XEmacs (#37451) + * Fri Mar 16 2001 Trond Eivind Glomsr�d - New locale.alias file for emacs-nox diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el index 5f0c4fd..4a2d30a 100644 --- a/rpm-spec-mode.el +++ b/rpm-spec-mode.el @@ -4,7 +4,7 @@ ;; Author: Stig Bj�rlykke, ;; Keywords: unix, languages -;; Version: 0.11e +;; Version: 0.11g ;; This file is not yet part of FSF Emacs or XEmacs. @@ -99,6 +99,13 @@ Set the macros _target, _target_arch and _target_os accordingly" :type 'string :group 'rpm-spec) +(defcustom rpm-completion-ignore-case t + "*Non-nil means that case differences are ignored during completion. +A value of nil means that case is significant. +This is used during Tempo template completion." + :type 'boolean + :group 'rpm-spec) + (defcustom rpm-spec-clean nil "Remove the build tree after the packages are made." :type 'boolean @@ -325,7 +332,6 @@ the package." (define-key rpm-spec-mode-map "\C-cxt" 'rpm-toggle-test) ;;May be better to have movement commands on \C-ck, and build on \C-c\C-k (define-key rpm-spec-mode-map "\C-c\C-i" 'rpm-insert-tag) - (define-key rpm-spec-mode-map "\C-u\C-c\C-i" 'rpm-change-tag) (define-key rpm-spec-mode-map "\C-c\C-n" 'rpm-forward-section) (define-key rpm-spec-mode-map "\C-c\C-p" 'rpm-backward-section) (define-key rpm-spec-mode-map "\C-c\C-t" 'rpm-insert-true-prefix) @@ -560,12 +566,18 @@ with no args, if that value is non-nil." (rpm-insert-f "%docdir " dirname)) ;;------------------------------------------------------------ +(defun rpm-completing-read (prompt table &optional pred require init hist) + "Read from the minibuffer, with completion. +Like `completing-read', but the variable `rpm-completion-ignore-case' +controls whether case is significant." + (let ((completion-ignore-case rpm-completion-ignore-case)) + (completing-read prompt table pred require init hist))) (defun rpm-insert (&optional what file-completion) "Insert given tag. Use file-completion if argument is t." (beginning-of-line) (if (not what) - (setq what (completing-read "Tag: " rpm-tags-list))) + (setq what (rpm-completing-read "Tag: " rpm-tags-list))) (if (string-match "^%" what) (setq read-text (concat "Packagename for " what ": ") insert-text (concat what " ")) @@ -610,7 +622,7 @@ with no args, if that value is non-nil." "Update given tag." (save-excursion (if (not what) - (setq what (completing-read "Tag: " rpm-tags-list))) + (setq what (rpm-completing-read "Tag: " rpm-tags-list))) (cond ((string-equal what "Group") (rpm-change-group)) @@ -642,7 +654,7 @@ with no args, if that value is non-nil." (defun rpm-insert-group (group) "Insert Group tag." - (interactive (list (completing-read "Group: " rpm-group-tags-list))) + (interactive (list (rpm-completing-read "Group: " rpm-group-tags-list))) (beginning-of-line) (insert "Group: " group "\n")) @@ -654,14 +666,16 @@ with no args, if that value is non-nil." (if (search-forward-regexp "^Group: \\(.*\\)$" nil t) (replace-match (concat "Group: " - (insert (completing-read "Group: " rpm-group-tags-list + (insert (rpm-completing-read "Group: " rpm-group-tags-list nil nil (match-string 1))))) (message "Group tag not found...")))) (defun rpm-insert-tag (&optional arg) - "Insert a tag." + "Insert or change a tag." (interactive "p") - (rpm-insert)) + (if current-prefix-arg + (rpm-change) + (rpm-insert))) (defun rpm-change-tag (&optional arg) "Change a tag." @@ -728,7 +742,7 @@ Go to beginning of current section." (defun rpm-goto-section (section) "Move point to the beginning of the specified section; leave point at previous location." - (interactive (list (completing-read "Section: " rpm-section-list))) + (interactive (list (rpm-completing-read "Section: " rpm-section-list))) (push-mark) (goto-char (point-min)) (or @@ -980,10 +994,10 @@ command." (let ((release (1+ (string-to-int (match-string 1))))) (setq release (concat (int-to-string release) (match-string 2))) (replace-match (concat "Release: " release)) - (message (concat "Release tag changed to " release ".")))) - (if (search-forward-regexp "^Release:[ \t]*%{?\\([^}]*\\)}?$" nil t) - (rpm-increase-release-with-macros) - (message "No Release tag found...")))) + (message (concat "Release tag changed to " release "."))) + (if (search-forward-regexp "^Release:[ \t]*%{?\\([^}]*\\)}?$" nil t) + (rpm-increase-release-with-macros) + (message "No Release tag found..."))))) ;;------------------------------------------------------------ diff --git a/site-start.el b/site-start.el index 31f9502..c17574c 100644 --- a/site-start.el +++ b/site-start.el @@ -6,18 +6,13 @@ (setq auto-mode-alist (cons '("\\.py$" . python-mode) auto-mode-alist)) (setq interpreter-mode-alist - (cons '("python" . python-mode) - interpreter-mode-alist)) + (cons '("python" . python-mode) interpreter-mode-alist)) ;; run functions from the /usr/share/emacs/site-lisp/site-start.d directory ;; Files in this directory ending with ".el" are run on startup -(let (list) - (setq list (directory-files "/usr/share/emacs/site-lisp/site-start.d" t "\\.el$")) - (while list - (load-file (car list)) - (setq list (cdr list))) - ) +(require 'cl) ; mapc isn't built into emacs 20 +(mapc 'load (directory-files "/usr/share/emacs/site-lisp/site-start.d" t "\\.el\\'")) ;; Use the rpm-spec-mode for spec files (require 'rpm-spec-mode) diff --git a/sources b/sources index 533061c..8deb106 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ -2a369e104d7557991811c06f982c2ade emacs-20.7.tar.bz2 +367bc83b70bd10b8908549087b73530d elisp-manual-21-2.6.tar.bz2 +7c55c72e7cc8f1cb49b57b670b82dba2 emacs-20.7.tar.bz2 606b7415499a88b839a7cf414e3caaa8 emacs-asian.tar.bz2 88cf8dd2d19b973d0a77b4430a66008f gnus-5.8.8.tar.bz2 112c8f7493ef295fc9022feb4653eab0 leim-20.7.tar.bz2