Browse Source

updated Emacs 25.1 RC2
renamed: coding-system-init.el.emacs24 -> coding-system-init.el.emacs25
renamed: emacs24-local.el -> emacs25-local.el
renamed: emacs24-vl.spec -> emacs25-vl.spec
renamed: emacs24.desktop.in -> emacs25.desktop.in
renamed: site-start.el.emacs24 -> site-start.el.emacs25

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

munepi 7 years ago
parent
commit
217ff6fd58

+ 0 - 0
e/emacs/coding-system-init.el.emacs24 → e/emacs/coding-system-init.el.emacs25


+ 0 - 0
e/emacs/emacs24-local.el → e/emacs/emacs25-local.el


+ 22 - 18
e/emacs/emacs24-vl.spec → e/emacs/emacs25-vl.spec

@@ -1,6 +1,6 @@
-%define emacsversion 24.5
-#% define gitdate 20110817
-%define emacsrelease 2%{?gitdate:.%gitdate}%{?_dist_release}
+%define emacsversion 25.1
+#% define gitcommit 20110817
+%define emacsrelease 1.rc2%{?gitcommit:.%gitcommit}%{?_dist_release}
 %define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
 
 %define _noVersionedDependencies 1
@@ -13,28 +13,28 @@
 Summary:      GNU Emacs editor 
 Summary(ja):  GNU Emacs エディタ
 Name:         emacs
-#Name:         emacs24
+#Name:         emacs25
 #Provides:     emacs-snapshot
 Version:      %{emacsversion}
 Release:      %{emacsrelease}
 #Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}.tar.xz
-#Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?gitdate:.git%gitdate}.tar.xz
-Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.xz
+#Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?gitcommit:.git%gitcommit}.tar.xz
+Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}-rc2.tar.xz
 #Source1:      emacs-snapshot.sh
 
-Source10:     site-start.el.emacs24
+Source10:     site-start.el.emacs25
 
 ## local settings for local system
-Source20:     emacs24-local.el
+Source20:     emacs25-local.el
 
 # desktop file
-Source50:     emacs24.desktop.in
+Source50:     emacs25.desktop.in
 
 ## Enable Japanese Menu
 ## http://www11.atwiki.jp/s-irie/pages/13.html
 # Source100:    menu-tree-el-%{menutreeelversion}.tar.gz
-# Source101:    menu-tree-init.el.emacs24
-Source102:    coding-system-init.el.emacs24
+# Source101:    menu-tree-init.el.emacs25
+Source102:    coding-system-init.el.emacs25
 
 ## default settings for Vine Linux
 Source150:    vine-default-base.el
@@ -66,7 +66,8 @@ Obsoletes:    emacs21 <= 21.2-0vl7
 Obsoletes:    emacs22 <= 22.1
 Obsoletes:    emacs23 <= 23.1
 Obsoletes:    emacs24 <= 24.1
-#Provides:     emacs24 = %{version}
+# Obsoletes:    emacs25 <= 25.1
+Provides:     emacs25 = %{version}
 Provides:     emacsen = 0.1
 #% prereq_ge    emacsen-common
 Requires(post):    emacsen-common
@@ -201,9 +202,9 @@ export PATH="$PATH:/sbin:/usr/sbin"
 
 ## install system-wide configure file
 %__install -m755 -d ${RPM_BUILD_ROOT}/etc/emacs
-%__install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs24-local.el
+%__install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs25-local.el
 %__sed -i -e 's/EMACS_VERSION/%{version}/g' \
-    ${RPM_BUILD_ROOT}/etc/emacs/emacs24-local.el
+    ${RPM_BUILD_ROOT}/etc/emacs/emacs25-local.el
 
 ## Python mode, php mode and rpm-spec mode
 
@@ -372,10 +373,10 @@ unset PRIORITY
 %dir %{_sysconfdir}/emacs-%{version}
 %dir %{_sysconfdir}/emacs-%{version}/site-start.d
 %{_sysconfdir}/emacs-%{version}/site-start.d/*.el
-%config(noreplace) %{_sysconfdir}/emacs/emacs24-local.el
+%config(noreplace) %{_sysconfdir}/emacs/emacs25-local.el
 %{_infodir}/*
 # %{_mandir}/*/*
-%{_datadir}/applications/emacs24.desktop
+%{_datadir}/applications/emacs25.desktop
 %{_datadir}/icons/hicolor/*
 # %{_datadir}/emacs-%{version}/site-lisp
 %dir %{_localstatedir}/games/emacs
@@ -383,8 +384,11 @@ unset PRIORITY
 
 
 %changelog
-* Wed Dec 30 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 24.5-2
-- rebuild with gnutls-3.4.7
+* Mon Aug 22 2016 Munehiro Yamamoto <munepi@vinelinux.org> 25.1-1.rc2-1
+- update to Emacs 25.1 Release Candidate 2
+
+* Mon Feb  8 2016 Munehiro Yamamoto <munepi@vinelinux.org> 25.0.90-1
+- update to 25.0.90
 
 * Sun Apr 12 2015 Munehiro Yamamoto <munepi@vinelinux.org> 24.5-1
 - new upstream release

+ 2 - 2
e/emacs/emacs24.desktop.in → e/emacs/emacs25.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Emacs24 Editor
-Name[ja]=Emacs24 エディタ
+Name=Emacs25 Editor
+Name[ja]=Emacs25 エディタ
 Comment=popular, very full featured text editor
 Comment[ja]=有名で高機能なテキストエディタ
 Icon=emacs

+ 4 - 4
e/emacs/site-start.el.emacs24 → e/emacs/site-start.el.emacs25

@@ -81,12 +81,12 @@ The version of vine-default.")
 (mapc 'load (directory-files "/etc/emacs-EMACS_VERSION/site-start.d" t "\\.el\\'"))
 
 ;;; load local configuration
-(if (file-exists-p (expand-file-name "/etc/emacs/emacs24-local.el"))
-    (load (expand-file-name "/etc/emacs/emacs24-local.el")))
+(if (file-exists-p (expand-file-name "/etc/emacs/emacs25-local.el"))
+    (load (expand-file-name "/etc/emacs/emacs25-local.el")))
 
 ;;; load vine-default configuration per user before vine-default-setup
-(if (file-exists-p (expand-file-name "~/.emacs.d/emacs24-vine-default.el"))
-    (load (expand-file-name "~/.emacs.d/emacs24-vine-default.el")))
+(if (file-exists-p (expand-file-name "~/.emacs.d/emacs25-vine-default.el"))
+    (load (expand-file-name "~/.emacs.d/emacs25-vine-default.el")))
 
 ;;; run vine-default-setup
 (vine-default-setup)