Browse Source

emacs 26.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11705 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 6 năm trước cách đây
mục cha
commit
67bb4414c2
2 tập tin đã thay đổi với 39 bổ sung23 xóa
  1. 37 21
      e/emacs/emacs26-vl.spec
  2. 2 2
      e/emacs/emacs26.desktop.in

+ 37 - 21
e/emacs/emacs26-vl.spec

@@ -1,4 +1,4 @@
-%define emacsversion 25.3
+%define emacsversion 26.1
 #% define gitcommit 20110817
 #%define emacsrelease 1.rc2%{?gitcommit:.%gitcommit}%{?_dist_release}
 %define emacsrelease 1%{?_dist_release}
@@ -14,7 +14,7 @@
 Summary:      GNU Emacs editor 
 Summary(ja):  GNU Emacs エディタ
 Name:         emacs
-#Name:         emacs25
+#Name:         emacs26
 #Provides:     emacs-snapshot
 Version:      %{emacsversion}
 Release:      %{emacsrelease}
@@ -23,19 +23,19 @@ Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}.tar.xz
 #Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}-rc2.tar.xz
 #Source1:      emacs-snapshot.sh
 
-Source10:     site-start.el.emacs25
+Source10:     site-start.el.emacs26
 
 ## local settings for local system
-Source20:     emacs25-local.el
+Source20:     emacs26-local.el
 
 # desktop file
-Source50:     emacs25.desktop.in
+Source50:     emacs26.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.emacs25
-Source102:    coding-system-init.el.emacs25
+Source102:    coding-system-init.el.emacs26
 
 ## default settings for Vine Linux
 Source150:    vine-default-base.el
@@ -68,7 +68,7 @@ Obsoletes:    emacs22 <= 22.1
 Obsoletes:    emacs23 <= 23.1
 Obsoletes:    emacs24 <= 24.1
 # Obsoletes:    emacs25 <= 25.1
-Provides:     emacs25 = %{version}
+Provides:     emacs26 = %{version}
 Provides:     emacsen = 0.1
 #% prereq_ge    emacsen-common
 Requires(post):    emacsen-common
@@ -80,11 +80,11 @@ BuildRequires: atk-devel
 BuildRequires: dbus-devel GConf2-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: gnutls-devel
-#if %{?_dist_release} >= "vl7"
-#BuildRequires: gtk3-devel
-#else
+%if %{?_dist_release} >= "vl7"
+BuildRequires: gtk3-devel
+%else
 BuildRequires: gtk2-devel
-#endif
+%endif
 BuildRequires: cairo-devel
 BuildRequires: freetype2-devel, fontconfig-devel
 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
@@ -135,15 +135,19 @@ export PATH="$PATH:/sbin:/usr/sbin"
 %configure --with-pop --with-sound \
     --libexecdir=%{_libdir} --infodir=%{infodir} \
     --disable-rename \
+%if %{?_dist_release} >= "vl7"
+    --with-x-toolkit=gtk3 \
+%else
     --with-x-toolkit=gtk \
+%endif
     --with-freetype --with-xft \
     --enable-font-backend \
     --without-gpm \
     --with-libotf \
     --with-m17n-flt \
     --with-dbus --with-gconf \
+    --disable-libsystemd \
     ;
-#    --with-x-toolkit=gtk3 \
 
 %__make bootstrap
 %__make %{?_smp_mflags}
@@ -155,6 +159,9 @@ export PATH="$PATH:/sbin:/usr/sbin"
 %makeinstall libexecdir=$RPM_BUILD_ROOT%{_libdir} \
 	infodir=${RPM_BUILD_ROOT}%{infodir} 
 
+# systemd files
+%__rm -rf $RPM_BUILD_ROOT%{_libdir}/systemd 
+
 ## This is a duplicate of the file in FLAVOR/site-lisp
 %__rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/subdirs.el || exit 1
 
@@ -203,9 +210,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/emacs25-local.el
+%__install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs26-local.el
 %__sed -i -e 's/EMACS_VERSION/%{version}/g' \
-    ${RPM_BUILD_ROOT}/etc/emacs/emacs25-local.el
+    ${RPM_BUILD_ROOT}/etc/emacs/emacs26-local.el
 
 ## Python mode, php mode and rpm-spec mode
 
@@ -222,6 +229,10 @@ strip $RPM_BUILD_ROOT%{_bindir}/* || :
 # install icons
 %__mkdir_p $RPM_BUILD_ROOT%{_datadir}/icons
 %__cp -a etc/images/icons/hicolor $RPM_BUILD_ROOT%{_datadir}/icons/
+## remove historical icons
+find $RPM_BUILD_ROOT%{_datadir}/icons/ -type f -name '*emacs22*' -exec rm -f {} \;
+find $RPM_BUILD_ROOT%{_datadir}/icons/ -type f -name '*emacs23*' -exec rm -f {} \;
+find $RPM_BUILD_ROOT%{_datadir}/icons/ -type f -name '*emacs-document23*' -exec rm -f {} \;
 
 ## remove man files
 %__rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/* || exit 1
@@ -241,10 +252,9 @@ EL="*.el"
 echo "/usr/bin/ctags
 /usr/bin/ebrowse
 /usr/bin/etags
-/usr/bin/rcs-checkin
 /usr/bin/emacs
 /usr/bin/emacsclient
-/usr/bin/grep-changelog
+/usr/share/appdata/emacs.appdata.xml
 /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}#"| 
@@ -374,18 +384,24 @@ unset PRIORITY
 %dir %{_sysconfdir}/emacs-%{version}
 %dir %{_sysconfdir}/emacs-%{version}/site-start.d
 %{_sysconfdir}/emacs-%{version}/site-start.d/*.el
-%config(noreplace) %{_sysconfdir}/emacs/emacs25-local.el
+%config(noreplace) %{_sysconfdir}/emacs/emacs26-local.el
 %{_infodir}/*
 # %{_mandir}/*/*
-%{_datadir}/applications/emacs25.desktop
-%{_datadir}/appdata/emacs.appdata.xml
+%{_datadir}/applications/emacs26.desktop
+%{_datadir}/appdata/emacs.appdata.xml.emacs-%{version}
 %{_datadir}/icons/hicolor/*
 # %{_datadir}/emacs-%{version}/site-lisp
-%dir %{_localstatedir}/games/emacs
-%{_localstatedir}/games/emacs/*
+#%dir %{_localstatedir}/games/emacs
+#%{_localstatedir}/games/emacs/*
 
 
 %changelog
+* Mon Jun  4 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 26.1-1
+- update to 26.1
+- build with GTK3 for VineSeed
+- add '--disable-libsystemd' option
+- drop games dir; upstream deleted
+
 * Tue May 29 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 25.3-1
 - update to 25.3
 - add appdata file

+ 2 - 2
e/emacs/emacs26.desktop.in

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