updated emacs24-vl.spec, site-start.el.emacs24: defined constants of recording the version of the vine-default system; modified emacs-build-system and report-emacs-bug-address for Vine Linux; completely dropped the definition of after-vine-default-setup-hook

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3303 ec354946-7b23-47d6-9f5a-488ba84defc7

e/emacs24/emacs24-vl.spec

@@ -1,6 +1,7 @@
 %define emacsversion 24.0.50
 %define bzrdate 20110318
-%define emacsrelease 6%{?bzrdate:.%bzrdate}%{?_dist_release}
+%define emacsrelease 7%{?bzrdate:.%bzrdate}%{?_dist_release}
+%define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
 
 %define _noVersionedDependencies 1
 %define prereq_ge()  %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
@@ -182,6 +183,7 @@ nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tr
 %__install -m 644 %{SOURCE10} \
 	$RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/site-start.el
 %__sed -i -e 's/EMACS_VERSION/%{version}/g' \
+          -e 's/VINE_DEFAULT_MAJOR_VERSION/%{vine_default_major_version}/g' \
 	$RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/site-start.el
 
 ## create site-start.d directory
@@ -366,6 +368,14 @@ unset PRIORITY
 
 
 %changelog
+* Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-7.20110318
+- updated site-start.el
+  - defined vine-default-major-version, vine-default-minor-version, 
+    vine-default-version
+  - set "ibus-el" to emacs-ime as default
+  - added ", modified for Vine Linux" to the end of emacs-build-system
+  - set "Vine _at_mark_ vinelinux.org" to report-emacs-bug-address
+
 * Sun Apr 03 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-6.20110318
 - fixed site-start.el
   - do not use the macro loop (contained in the common lisp)

e/emacs24/site-start.el.emacs24

@@ -2,11 +2,27 @@
 ;;; GNU Emacs EMACS_VERSION default settings for Vine Linux
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(setq emacs-build-system 
+      (concat emacs-build-system ", modified for Vine Linux"))
+
+(setq report-emacs-bug-address "Vine@vinelinux.org")
+
 (defcustom emacs-ime (getenv "EMACS_IME")
   "A variable of default Input Method Editor"
   :type 'string)
 (if (null emacs-ime)
-    (setq emacs-ime "scim"))
+    (setq emacs-ime "ibus-el"))
+
+(defconst vine-default-major-version VINE_DEFAULT_MAJOR_VERSION "\
+Major version number of this version of vine-default.
+This variable equals the major version number of Vine Linux that is running.")
+
+(defconst vine-default-minor-version 0 "\
+Minor version number of this version of vine-default.
+This variable is the system number for vine-default-major-version.")
+
+(defconst vine-default-version (+ vine-default-major-version (/ (float vine-default-minor-version) 10)) "\
+The version of vine-default.")
 
 (defcustom vine-default t
   "A boolean for all Vine Linux default settings"
@@ -25,9 +41,9 @@
 (defvar vine-default-setup-hook nil
   "List of functions to be called at vine-default-setup")
 
-(defvar after-vine-default-setup-hook nil 
+;; (defvar after-vine-default-setup-hook nil 
-  "This hook is obsolete! Please do not use this hook. 
+;;   "This hook is obsolete! Please do not use this hook. 
-   List of functions to be called at the end of vine-default-setup")
+;;    List of functions to be called at the end of vine-default-setup")
 
 (defun vine-default-setup ()
   "A function for setup to default configurations of Vine Linux"
@@ -40,6 +56,7 @@
       (message "Loading vine-default-faces ...")
       (require 'vine-default-faces))
     (run-hooks 'vine-default-setup-hook)
+    ;; (run-hooks 'after-vine-default-setup-hook); obsolete
     )
   )