Browse Source

updated emacs, emacs24, yatex, howm

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2599 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 13 years ago
parent
commit
7d57d469b8

+ 17 - 9
e/emacs/emacs23-vl.spec

@@ -1,6 +1,6 @@
-%define emacsversion 23.2
+%define emacsversion 23.2.92
 #% define cvsdate 20100104
-%define emacsrelease 5%{?cvsdate:.%cvsdate}%{?_dist_release}
+%define emacsrelease 1%{?cvsdate:.%cvsdate}%{?_dist_release}
 
 %define _noVersionedDependencies 1
 %define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
@@ -14,8 +14,8 @@ Summary(ja):  GNU Emacs エディタ
 Name:         emacs
 Version:      %{emacsversion}
 Release:      %{emacsrelease}
-Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?cvsdate:.cvs%cvsdate}.tar.bz2
-#Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
+#Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?cvsdate:.cvs%cvsdate}.tar.bz2
+Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
 
 ## Sources from Rawhide 21.2-11
 Source10:     site-start.el.emacs23
@@ -54,12 +54,12 @@ Patch20:      emacs-23.1.90-fixed-resolution.patch
 #Patch31:      emacs-23.1-indian.patch
 #Patch32:      emacs-23.1-memmove.patch
 # Accepted by upstream.
-Patch33: emacs-23.2-m17ncheck.patch
+#Patch33: emacs-23.2-m17ncheck.patch
 # Fix rhbz#595546
 # Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158
 Patch34: emacs-23.2-hideshow-comment.patch
 # Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129
-Patch35: emacs-23.2-spacing.patch
+#Patch35: emacs-23.2-spacing.patch
 
 # security patches (from Debian)
 
@@ -132,9 +132,9 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
 #%patch30 -p1 -b .scroll
 #%patch31 -p1
 #%patch32 -p1 -b .memmove
-%patch33 -p1 -b .m17ncheck
+#%patch33 -p1 -b .m17ncheck
 %patch34 -p0 -b .hideshow-comment
-%patch35 -p1 -b .spacing
+#%patch35 -p1 -b .spacing
 
 #%patch501 -p1 -b .movemail
 
@@ -276,7 +276,9 @@ echo "/usr/bin/b2m
 /usr/bin/emacs
 /usr/bin/emacsclient
 /usr/bin/gctags
-/usr/bin/grep-changelog"|
+/usr/bin/grep-changelog
+/usr/share/icons/hicolor/scalable/apps/emacs.svg
+/usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg"|
     %__sed -e "s#[^\n]*#mv ${RPM_BUILD_ROOT}\0 ${RPM_BUILD_ROOT}\0.emacs-%{version}#"| 
     awk '{system($_)}'  
 
@@ -421,6 +423,12 @@ unset PRIORITY
 %{_localstatedir}/games/emacs/*
 
 %changelog
+* Sat Jan 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.2.92-1
+- updated to 23.2.92 (23.3 pretest)
+- dropped upstreamed patches
+  - emacs-23.2-m17ncheck.patch
+  - emacs-23.2-spacing.patch
+
 * Sun Dec 05 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.2-5
 - applied new vine-default system
   - updated site-start.el

+ 10 - 8
e/emacs/site-start.el.emacs23

@@ -31,14 +31,16 @@
 
 (defun vine-default-setup ()
   "A function for setup to default configurations of Vine Linux"
-  (if vine-default
-      (progn
-	(message "Starting vine-default-setup ...")
-	(if vine-default-base (require 'vine-default-base))
-	(if vine-default-faces (require 'vine-default-faces))
-	(run-hooks 'vine-default-setup-hook)
-	(run-hooks 'after-vine-default-setup-hook);; obsolete
-	)
+  (when vine-default
+    (message "Starting vine-default-setup ...")
+    (when vine-default-base 
+      (message "Loading vine-default-base ...")
+      (require 'vine-default-base))
+    (when vine-default-faces 
+      (message "Loading vine-default-faces ...")
+      (require 'vine-default-faces))
+    (run-hooks 'vine-default-setup-hook)
+    (run-hooks 'after-vine-default-setup-hook);; obsolete
     )
   )
 

+ 1 - 1
e/emacs24/emacs-snapshot.sh

@@ -13,7 +13,7 @@ cleanup() {
 unset CDPATH
 pwd=$(pwd)
 #SNAPDATE=$(date +%Y%m%d)
-SNAPDATE_BZR=2010-12-03 && SNAPDATE=$(echo $SNAPDATE_BZR | sed s/-//g)
+SNAPDATE_BZR=2011-01-28 && SNAPDATE=$(echo $SNAPDATE_BZR | sed s/-//g)
 
 cd "$tmp"
 #bzr branch bzr://bzr.savannah.gnu.org/emacs/trunk emacs

+ 9 - 7
e/emacs24/emacs24-vl.spec

@@ -1,6 +1,6 @@
 %define emacsversion 24.0.50
-%define bzrdate 20110101
-%define emacsrelease 2%{?bzrdate:.%bzrdate}%{?_dist_release}
+%define bzrdate 20110128
+%define emacsrelease 3%{?bzrdate:.%bzrdate}%{?_dist_release}
 
 %define _noVersionedDependencies 1
 %define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
@@ -263,7 +263,9 @@ echo "/usr/bin/ctags
 /usr/bin/rcs-checkin
 /usr/bin/emacs
 /usr/bin/emacsclient
-/usr/bin/grep-changelog" |
+/usr/bin/grep-changelog
+/usr/share/icons/hicolor/scalable/apps/emacs.svg
+/usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg" |
     %__sed -e "s#[^\n]*#mv ${RPM_BUILD_ROOT}\0 ${RPM_BUILD_ROOT}\0.emacs-%{version}#"| 
     awk '{system($_)}'  
 
@@ -391,7 +393,10 @@ unset PRIORITY
 
 
 %changelog
-* Thu Dec 23 2010 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-2.20110101
+* Sat Jan 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-3.20110128
+- emacs24 24.0.50 (20110128) snapshot
+
+* Sun Jan 02 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-2.20110101
 - emacs24 24.0.50 (20110101) snapshot
 
 * Sun Dec 05 2010 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-1.20101203
@@ -403,9 +408,6 @@ unset PRIORITY
     - merged to emacsen-common package as show-vine-default.sh
   - renamed local wide configration file to emacs24-local.el
 - updated menu-tree.el to version 0.97
-
-* Sun Nov 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-1.20101120
-- emacs24 24.0.50 (20101120) snapshot 
 - added Provides: emacs-snapshot
 
 * Sat Oct 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.2-4

+ 10 - 8
e/emacs24/site-start.el.emacs24

@@ -31,14 +31,16 @@
 
 (defun vine-default-setup ()
   "A function for setup to default configurations of Vine Linux"
-  (if vine-default
-      (progn
-	(message "Starting vine-default-setup ...")
-	(if vine-default-base (require 'vine-default-base))
-	(if vine-default-faces (require 'vine-default-faces))
-	(run-hooks 'vine-default-setup-hook)
-	(run-hooks 'after-vine-default-setup-hook);; obsolete
-	)
+  (when vine-default
+    (message "Starting vine-default-setup ...")
+    (when vine-default-base 
+      (message "Loading vine-default-base ...")
+      (require 'vine-default-base))
+    (when vine-default-faces 
+      (message "Loading vine-default-faces ...")
+      (require 'vine-default-faces))
+    (run-hooks 'vine-default-setup-hook)
+    (run-hooks 'after-vine-default-setup-hook);; obsolete
     )
   )
 

+ 3 - 2
h/howm/howm-init.el

@@ -10,7 +10,8 @@
 
 (add-hook 'vine-default-setup-hook
 	  (lambda()
-	    (if vine-default-howm
-		(require 'vine-default-howm))))
+	    (when vine-default-howm
+	      (message "Loading vine-default-howm ...")
+	      (require 'vine-default-howm))))
 
 ;;; end of file

+ 5 - 1
h/howm/howm-vl.spec

@@ -1,6 +1,6 @@
 Name:		howm
 Version:	1.3.9.1
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	a note-taking tool on Emacs
 Summary(ja):	Emacs で断片的なメモをどんどんとるための環境
 License:	GPL
@@ -86,6 +86,10 @@ fi
 %{emacsen_pkgdir}/remove/%{name}
 
 %changelog
+* Sat Jan 29 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.3.9.1-2
+- updated howm-init.el
+  - output "Loading vine-default-howm ..." to the buffer *Messages*
+
 * Sun Jan 02 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.3.9.1-1
 - new upstream release
 - dropped howm-1.3.9-check-make-local-hook.patch

+ 28 - 0
y/yatex/vine-default-yahtml.el

@@ -0,0 +1,28 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;  -*- coding: utf-8-unix -*-
+;;  FSF Emacs 23 用 Vine Linux YaHtml 設定
+;;    Munehiro Yamamoto <munepi@vinelinux.org>
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; YaHtml-mode: provided by YaTeX
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(autoload 'yahtml-mode "yahtml" "Yet Another HTML mode" t)
+
+(setq auto-mode-alist
+      (cons (cons "\\.html$" 'yahtml-mode) auto-mode-alist))
+
+;; 自動改行を無効
+(add-hook 'yahtml-mode-hook
+	  '(lambda () (setq auto-fill-function nil)))
+
+(setq yahtml-www-browser "firefox")
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(provide 'vine-default-yahtml)
+
+;; Local Variables:
+;; mode: emacs-lisp
+;; End:

+ 11 - 15
y/yatex/vine-default-yatex.el

@@ -5,13 +5,16 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; YaTeX 1.73
+;; YaTeX 1.74
 ;;   [La]TeX 入力モード
 ;;   M-x yatex とするか、.tex で終わるファイルを読み込むと起動します
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (autoload 'yatex-mode "yatex" "Yet Another LaTeX mode" t)
 
+;; [推奨] やてふの prefix を \C-c から \C-c t へ変更 [yatex:04567]
+(setq YaTeX-inhibit-prefix-letter t)
+
 ;; YaTeX-mode
 ;; yatex-mode を起動させる設定
 ;; (setq auto-mode-alist
@@ -20,23 +23,21 @@
       (append 
        '(("\\.\\(tex\\|sty\\|cls\\|fd\\|ind\\|idx\\|ltx\\|clo\\|bbl\\)$" . 
 	  yatex-mode)) auto-mode-alist))
-(setq YaTeX-kanji-code 4               ; 1: SJIS, 2: JIS, 3: EUC, 4: UTF-8
-      YaTeX-latex-message-code 'utf-8  ; 文字化けしないようにする
-      ;;YaTeX-no-begend-shortcut t       ; shortcut ではなく補完を利用
+(setq YaTeX-kanji-code 4               ;; 1: SJIS, 2: JIS, 3: EUC, 4: UTF-8
+      YaTeX-latex-message-code 'utf-8  ;; 文字化けしないようにする
+      ;; YaTeX-no-begend-shortcut t    ;; shortcut ではなく補完を利用
       YaTeX-use-AMS-LaTeX t
       YaTeX-use-LaTeX2e t
       YaTeX-use-font-lock t
-      dvi2-command "xdvi"
-      tex-command "platex -kanji=utf8 -src-specials"
-      dviprint-command-format "dvips %s | lpr"
+      dvi2-command "pxdvi"  ;; xdvi
+      tex-command "eplatex -kanji=utf8 -src-specials"
+      dviprint-command-format "pdvips %s | lpr"  ;; dvips
       makeindex-command "mendex"
-)
+      )
 
 ;; 自動改行を無効
 (add-hook 'yatex-mode-hook 
 	  '(lambda () (setq auto-fill-function nil))) 
-(add-hook 'yahtml-mode-hook
-	  '(lambda () (setq auto-fill-function nil)))
 
 ;;; TeX-master に関しては safe にする
 ;;; from AUCTeX tex.el 
@@ -49,11 +50,6 @@
 (add-hook 'yatex-mode-hook 
 	  '(lambda () (server-start)))
 
-;; YaHtml-mode
-(setq auto-mode-alist
-      (cons (cons "\\.html$" 'yahtml-mode) auto-mode-alist))
-(autoload 'yahtml-mode "yahtml" "Yet Another HTML mode" t)
-(setq yahtml-www-browser "firefox")
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

+ 25 - 0
y/yatex/yatex-init.el

@@ -0,0 +1,25 @@
+;;
+;; yatex-init.el
+;;
+;; 	for Vine Linux with emacsen-common
+;; 	Munehiro Yamamoto <munepi@vinelinux.org>
+
+(defcustom vine-default-yatex t
+  "A boolean for vine-default-yatex"
+  :type 'boolean)
+
+(defcustom vine-default-yahtml t
+  "A boolean for vine-default-yahtml"
+  :type 'boolean)
+
+(add-hook 'vine-default-setup-hook
+	  (lambda()
+	    (when vine-default-yatex
+	      (message "Loading vine-default-yatex ...")
+	      (require 'vine-default-yatex))
+	    (when vine-default-yahtml
+	      (message "Loading vine-default-yahtml ...")
+	      (require 'vine-default-yahtml))
+	    ))
+
+;;; end of file

+ 26 - 14
y/yatex/yatex-vl.spec

@@ -3,7 +3,7 @@
 
 Name:          yatex
 Version:       1.74
-Release:       3%{?_dist_release}
+Release:       4%{?_dist_release}
 License:       Distributable
 Source0:       http://www.yatex.org/yatex%{version}.tar.gz 
 #Source0:       http://www.yatex.org/yatex10203151806.tar.gz 
@@ -11,6 +11,7 @@ Source1:       %{name}-install.sh
 Source2:       %{name}-remove.sh
 Source3:       %{name}-init.el
 Source4:       vine-default-%{name}.el
+Source5:       vine-default-yahtml.el
 
 ## pre-formatted info files here
 Source10:      yatexe
@@ -61,35 +62,36 @@ YaTeX(野鳥)とは、EmacsでLaTeXソースを書くときに生ずる手間を
 
 %build
 
-( cd docs
-  chmod 644 *
-  install -v -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
+(cd docs
+    chmod 644 *
+    %__install -v -m 644 %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
 )
 
 
 %install
 
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
 
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{name}
-mkdir -p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/install
-mkdir -p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/remove
-mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
+%__mkdir_p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{name}
+%__mkdir_p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/install
+%__mkdir_p ${RPM_BUILD_ROOT}%{emacsen_pkgdir}/remove
+%__mkdir_p ${RPM_BUILD_ROOT}%{_infodir}
 
 
 #
 # install el files
 #
 
-cp -a *.el makefile help ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/%{name}
-cp -a %{SOURCE3} %{SOURCE4} \
-    ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/%{name}/
+%__cp -a *.el makefile help \
+      ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/%{name}
+%__cp -a %{SOURCE3} %{SOURCE4} %{SOURCE5} \
+      ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/%{name}/
 
 #
 # install info files
 #
 
-install -m 644 docs/{yahtmle,yahtmlj,yatexe,yatexj} \
+%__install -m 644 docs/{yahtmle,yahtmlj,yatexe,yatexj} \
    ${RPM_BUILD_ROOT}%{_infodir}
 
 
@@ -103,7 +105,7 @@ install -m 644 docs/{yahtmle,yahtmlj,yatexe,yatexj} \
 
 
 %clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
 
 
 %post
@@ -164,6 +166,16 @@ fi
 
 
 %changelog 
+* Sat Jan 29 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.74-4
+- updated vine-default-yatex.el
+  - added (setq YaTeX-inhibit-prefix-letter t) [yatex:04567]
+  - supported TeX Live
+    - used "eplatex", "pxdvi", "pdvips" as default commands
+- updated yatex-init.el
+  - output "Loading vine-default-yatex ..." to the buffer *Messages*
+  - defined vine-default-yahtml
+- added vine-default-yahtml.el
+
 * Tue Jan 04 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.74-3
 - updated vine-default-yatex.el
   - added bbl extension in auto-mode-alist to run yatex-mode