diff --git a/.cvsignore b/.cvsignore index 86ced8f..46989a2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -elisp-manual-21-2.7.tar.bz2 +elisp-manual-21-2.8.tar.bz2 emacs-21.2.tar.bz2 -emacs-asian.tar.bz2 +emacs-asian-0.2.tar.bz2 leim-21.2.tar.bz2 diff --git a/emacs.desktop b/emacs.desktop index 8737a16..58c9a3d 100644 --- a/emacs.desktop +++ b/emacs.desktop @@ -29,3 +29,7 @@ Path= Type=Application Terminal=0 MapNotify=false +Categories=TextEditor;Development;X-Red-Hat-Base; +Encoding=UTF-8 + + diff --git a/emacs.spec b/emacs.spec index 452ed2f..7b52367 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,7 +1,7 @@ Summary: The libraries needed to run the GNU Emacs text editor. Name: emacs Version: 21.2 -Release: 2a +Release: 15 License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -13,21 +13,22 @@ Source5: dotemacs Source6: site-start.el Source7: python-mode.el Source8: http://www.tihlde.org/~stigb/rpm-spec-mode.el -Source9: emacs-asian.tar.bz2 -Source10: ftp://ftp.gnu.org/gnu/emacs/elisp-manual-21-2.7.tar.bz2 -# 1.0.0 - http://prdownloads.sourceforge.net/php-mode/php-mode-100.el +Source9: emacs-asian-0.2.tar.bz2 +Source10: ftp://ftp.gnu.org/gnu/emacs/elisp-manual-21-2.8.tar.bz2 +# 1.0.2 - http://prdownloads.sourceforge.net/php-mode/php-mode-102.el Source11: php-mode.el Source12: php-mode-init.el Source13: ssl.el Source14: po-mode.el Source15: po-mode-init.el -Patch50: emacs-20.7-s390.patch +Patch50: emacs-21.2-s390.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/install-info -BuildRequires: Xaw3d-devel glibc-devel gcc XFree86-devel bzip2 ncurses-devel +BuildRequires: glibc-devel gcc XFree86-devel bzip2 ncurses-devel BuildRequires: zlib-devel libpng-devel libjpeg-devel libungif-devel libtiff-devel Obsoletes: emacs-nox emacs-X11 Conflicts: gettext < 0.10.40 +Prereq: dev %description Emacs is a powerful, customizable, self-documenting, modeless text @@ -80,8 +81,6 @@ export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" #to find installinfo export PATH="$PATH:/sbin:/usr/sbin" -autoconf - %configure --with-gcc --with-pop --with-sound make @@ -123,8 +122,8 @@ mv $RPM_BUILD_ROOT/usr/bin/ctags $RPM_BUILD_ROOT/usr/bin/gctags # GNOME / KDE files -mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications -install -c -m 0644 %SOURCE3 $RPM_BUILD_ROOT/etc/X11/applnk/Applications/ +mkdir -p $RPM_BUILD_ROOT/usr/share/applications +install -c -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/applications/gnu-emacs.desktop mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps install -c -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/pixmaps/ @@ -153,7 +152,7 @@ rm -f $RPM_BUILD_ROOT/usr/share/emacs/%{version}/etc/ctags* # The elisp reference manual bzcat %{SOURCE10} | tar xf - -pushd elisp-manual-21-2.7 +pushd elisp-manual-21-2.8 install -m 644 elisp elisp-? elisp-?? $RPM_BUILD_ROOT/%{_infodir} popd @@ -239,7 +238,7 @@ fi %attr(0755,root,root) /usr/libexec/emacs/%{version}/*/movemail %attr(0644,root,root) %config /usr/share/emacs/site-lisp/site-start.el %dir /usr/share/emacs/site-lisp/site-start.d -%config(noreplace) /etc/X11/applnk/Applications/emacs.desktop +%config(noreplace) /usr/share/applications/gnu-emacs.desktop /usr/share/pixmaps/emacs.png %files -f el-filelist el @@ -256,6 +255,46 @@ fi %dir /usr/share/emacs/%{version}/leim %changelog +* Tue Aug 6 2002 Trond Eivind Glomsr�d 21.2-15 +- Don't use canna by default (# 70870) + +* Thu Aug 1 2002 Trond Eivind Glomsr�d 21.2-14 +- Fixes to desktop file (add encoding, add missing a ";") +- Update s390 patch + +* Wed Jul 24 2002 Trond Eivind Glomsr�d 21.2-13 +- rpm -> rpmbuild for rpmspec mode (#68185) + +* Mon Jul 22 2002 Trond Eivind Glomsr�d 21.2-12 +- desktop file changes (#69385) + +* Mon Jul 8 2002 Trond Eivind Glomsr�d 21.2-11 +- Fix php-mode to not initialize on e.g. foophp.c (#67592) + +* Thu Jun 27 2002 Trond Eivind Glomsr�d 21.2-10 +- Downgrade po-mode + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Mon Jun 17 2002 Trond Eivind Glomsr�d 21.2-8 +- #66808 + +* Wed May 29 2002 Trond Eivind Glomsr�d 21.2-7 +- Rebuild + +* Mon May 20 2002 Trond Eivind Glomsr�d 21.2-6 +- Prereq dev + +* Thu May 16 2002 Trond Eivind Glomsr�d 21.2-5 +- Update the elisp manual and po-mode + +* Tue May 7 2002 Trond Eivind Glomsr�d 21.2-4 +- php-mode 1.0.2 + +* Thu Apr 25 2002 Trond Eivind Glomsr�d 21.2-3 +- Update po-mode to the one from gettext 0.11.1 + * Mon Apr 8 2002 Trond Eivind Glomsr�d 21.2-2 - Tweak mouse init process (#59757) diff --git a/php-mode-init.el b/php-mode-init.el index 402ed2f..f98bb95 100644 --- a/php-mode-init.el +++ b/php-mode-init.el @@ -1,6 +1,6 @@ ;; Use php-mode for .php,.php3,.php4 and .phtml files (autoload 'php-mode "php-mode") -(setq auto-mode-alist (cons '("\\.php[34]\\|.php\\|.phtml" . php-mode) +(setq auto-mode-alist (cons '("\\.php[34]\\'\\|\\.php\\'\\|\\.phtml\\'" . php-mode) auto-mode-alist)) diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el index 554c5fa..ae123f7 100644 --- a/rpm-spec-mode.el +++ b/rpm-spec-mode.el @@ -355,7 +355,7 @@ the package." "---" ["Go to section..." rpm-mouse-goto-section :keys "C-c g"] ["Forward section" rpm-forward-section t] - ["Backward sectoin" rpm-backward-section t] + ["Backward section" rpm-backward-section t] "---" ["Add changelog entry..." rpm-add-change-log-entry t] ["Increase release-tag" rpm-increase-release-tag t] @@ -781,7 +781,7 @@ leave point at previous location." (defun rpm-build (buildoptions) "Build this rpm-package." (setq rpm-buffer-name - (concat "*rpm " buildoptions " " + (concat "*rpmbuild " buildoptions " " (file-name-nondirectory buffer-file-name) "*")) (rpm-process-check rpm-buffer-name) (if (get-buffer rpm-buffer-name) @@ -815,61 +815,62 @@ leave point at previous location." (set-buffer (get-buffer rpm-buffer-name)) (goto-char (point-max))) (let ((process - (apply 'start-process "rpm" rpm-buffer-name "rpm" buildoptions))) + (apply 'start-process "rpmbuild" rpm-buffer-name "rpmbuild" + 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))) (defun rpm-build-bp (&optional arg) - "Run a `rpm -bp'." + "Run a `rpmbuild -bp'." (interactive "p") (if rpm-spec-short-circuit - (message "Cannot run `rpm -bp' with --short-circuit") + (message "Cannot run `rpmbuild -bp' with --short-circuit") (setq rpm-no-gpg t) (rpm-build "-bp"))) (defun rpm-build-bl (&optional arg) - "Run a `rpm -bl'." + "Run a `rpmbuild -bl'." (interactive "p") (if rpm-spec-short-circuit - (message "Cannot run `rpm -bl' with --short-circuit") + (message "Cannot run `rpmbuild -bl' with --short-circuit") (setq rpm-no-gpg t) (rpm-build "-bl"))) (defun rpm-build-bc (&optional arg) - "Run a `rpm -bc'." + "Run a `rpmbuild -bc'." (interactive "p") (setq rpm-no-gpg t) (rpm-build "-bc")) (defun rpm-build-bi (&optional arg) - "Run a `rpm -bi'." + "Run a `rpmbuild -bi'." (interactive "p") (setq rpm-no-gpg t) (rpm-build "-bi")) (defun rpm-build-bb (&optional arg) - "Run a `rpm -bb'." + "Run a `rpmbuild -bb'." (interactive "p") (if rpm-spec-short-circuit - (message "Cannot run `rpm -bb' with --short-circuit") + (message "Cannot run `rpmbuild -bb' with --short-circuit") (setq rpm-no-gpg nil) (rpm-build "-bb"))) (defun rpm-build-bs (&optional arg) - "Run a `rpm -bs'." + "Run a `rpmbuild -bs'." (interactive "p") (if rpm-spec-short-circuit - (message "Cannot run `rpm -bs' with --short-circuit") + (message "Cannot run `rpmbuild -bs' with --short-circuit") (setq rpm-no-gpg nil) (rpm-build "-bs"))) (defun rpm-build-ba (&optional arg) - "Run a `rpm -ba'." + "Run a `rpmbuild -ba'." (interactive "p") (if rpm-spec-short-circuit - (message "Cannot run `rpm -ba' with --short-circuit") + (message "Cannot run `rpmbuild -ba' with --short-circuit") (setq rpm-no-gpg nil) (rpm-build "-ba"))) diff --git a/sources b/sources index 06ee557..cfaaed6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -5fefba94ab9e079b0b0fd3db36a115c1 elisp-manual-21-2.7.tar.bz2 +a41fdcc6436250b8935fb01af0701cf8 elisp-manual-21-2.8.tar.bz2 4154200b62be7fd1483cfd58e5346e22 emacs-21.2.tar.bz2 -606b7415499a88b839a7cf414e3caaa8 emacs-asian.tar.bz2 +7d6b41d2afc6b2653c0ae3dcbee9e235 emacs-asian-0.2.tar.bz2 9ead88f064df69c718f7dc18ed3240bd leim-21.2.tar.bz2