updated to 24.1

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

e/emacs/emacs23-vl.spec → e/emacs/emacs24-vl.spec

@@ -1,6 +1,6 @@
-%define emacsversion 23.4
+%define emacsversion 24.0.97
-#% define rcversion rc1
+#% define bzrdate 20110817
-%define emacsrelease 1%{?rcversion:.%rcversion}%{?_dist_release}
+%define emacsrelease 1%{?bzrdate:.%bzrdate}%{?_dist_release}
 %define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
 
 %define _noVersionedDependencies 1
@@ -12,72 +12,42 @@
 
 Summary:      GNU Emacs editor 
 Summary(ja):  GNU Emacs エディタ
-Name:         emacs
+Name:         emacs24
+Provides:     emacs-snapshot
 Version:      %{emacsversion}
 Release:      %{emacsrelease}
-Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}.tar.bz2
+#Source0:      ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?bzrdate:.bzr%bzrdate}.tar.xz
-#Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}%{?rcversion:-%rcversion}.tar.gz
+Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
-
+Source1:      emacs-snapshot.sh
-## Sources from Rawhide 21.2-11
+
-Source10:     site-start.el.emacs23
+Source10:     site-start.el.emacs24
-Source11:     python-mode.el
-Source12:     http://www.tihlde.org/~stigb/rpm-spec-mode.el
-Source13:     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
-Source14:     php-mode.el
-Source15:     php-mode-init.el
-Source16:     ssl.el
-Source17:     po-mode.el
-Source18:     po-mode-init.el
 
 ## local settings for local system
-Source20:     emacs23-local.el
+Source20:     emacs24-local.el
 
 # desktop file
-Source50:     emacs23.desktop.in
+Source50:     emacs24.desktop.in
 
 ## Enable Japanese Menu
 ## http://www11.atwiki.jp/s-irie/pages/13.html
 Source100:    menu-tree-el-%{menutreeelversion}.tar.gz
-Source110:    menu-tree-init.el.emacs23
+Source110:    menu-tree-init.el.emacs24
 
 ## default settings for Vine Linux
 Source150:    vine-default-base.el
 Source151:    vine-default-faces.el
 
 ## Vine Patch(es)
-Patch10:      emacs-21.1-ppc-nocombreloc.patch
+#Patch10:      emacs-21.1-ppc-nocombreloc.patch
 Patch11:      emacs-23.0.60-locallisppath.patch
 Patch20:      emacs-23.1.90-fixed-resolution.patch
+Patch30:      emacs-24.0.90-libs-termcap.patch
 
 # Fixed in upstream CVS. (from Fedora)
-#Patch30:      emacs-23.1-scroll.patch
-#Patch31:      emacs-23.1-indian.patch
-#Patch32:      emacs-23.1-memmove.patch
-# Accepted by upstream.
-#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
-# http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/106247
-Patch36: emacs-23.3-wm-state-hidden.patch
-# rhbz#751154
-Patch37: emacs-23.3-xgselect.patch
-# http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/103228
-Patch38: emacs-23.1-103228_103227.patch
-# Upstream implemented the change in revno. 101105
-Patch40: emacs-23.1-xdg.patch
-# http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00387.html
-#Patch41: emacs-23.3-ede-cve-2012-0035.patch
 
 # security patches (from Debian)
 
 # security patches (from Ubuntu)
-# # http://www.vupen.com/english/advisories/2010/0734
-# # https://code.launchpad.net/~ubuntu-branches/ubuntu/karmic/emacs23/karmic-security
-# Patch501:      emacs23-CVE-2010-0825-fix-movemail-race.diff
 
 # patches from Mandrake
 Patch1001:    emacs-21.1-bzip2.patch.bz2
@@ -85,7 +55,7 @@ Patch1001:    emacs-21.1-bzip2.patch.bz2
 License:      GPLv3+
 Group:        Applications/Editors/Emacs
 
-Distribution: Vine
+Distribution: Vine Linux
 Vendor:       Project Vine
 Packager:     munepi, daisuke
 
@@ -95,28 +65,32 @@ Obsoletes:    mule-base, mule-canna, mule-wnn6, mule, emacs-beta
 Obsoletes:    emacs21 <= 21.2-0vl7
 Obsoletes:    emacs22 <= 22.0.50
 Obsoletes:    emacs23 <= 23.0.91-2.20090325vl5
-Provides:     emacs23 = %{version}
+Provides:     emacs24 = %{version}
 Provides:     emacsen = 0.1
 #% prereq_ge    emacsen-common
 Requires(post):    emacsen-common
 Requires(postun):    emacsen-common
 
 BuildRequires: autoconf
-%if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl7"
+BuildRequires: xz
 BuildRequires: atk-devel
 BuildRequires: dbus-devel GConf2-devel
 BuildRequires: alsa-lib-devel
+BuildRequires: gnutls-devel
+%if %{?_dist_release} >= "vl7"
+BuildRequires: gtk3-devel
+%else
+BuildRequires: gtk2-devel
 %endif
-BuildRequires: gtk2-devel, cairo-devel
+BuildRequires: cairo-devel
-BuildRequires: freetype-devel, fontconfig-devel
+BuildRequires: freetype2-devel, fontconfig-devel
 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
-##!! For vl5, m17n-lib-devel (plus)
 BuildRequires: librsvg2-devel, libotf-devel
-%if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl7"
+BuildRequires: ImageMagick-devel
+BuildRequires: libxml2-devel > 2.6.17
 BuildRequires: m17n-lib-devel
-%endif
 BuildRequires: libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel
-BuildRequires: libXt-devel, libXpm-devel, ncurses-devel
+BuildRequires: libSM-devel, libXt-devel, libXpm-devel, ncurses-devel
 BuildRequires: xorg-x11-proto-devel, zlib-devel
 BuildRequires: texinfo
 BuildRequires: nkf
@@ -139,25 +113,12 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
 
 %patch11 -p1
 %patch20 -p1
-
+%patch30 -p1
-#%patch30 -p1 -b .scroll
-#%patch31 -p1
-#%patch32 -p1 -b .memmove
-#%patch33 -p1 -b .m17ncheck
-%patch34 -p0 -b .hideshow-comment
-#%patch35 -p1 -b .spacing
-%patch36 -p1 -b .wm-state-hidden
-%patch37 -p1 -b .xgselect
-%patch38 -p0 -b .svn17
-%patch40 -p1 -b .xdg
-#%patch41 -p1 -b .ede-cve-2012-0035
-
-#%patch501 -p1 -b .movemail
 
 %patch1001 -p1
 
-autoconf
+#autoconf
-
+autoreconf -i -I m4
 
 %build
 
@@ -168,18 +129,17 @@ export PATH="$PATH:/sbin:/usr/sbin"
 %configure --with-pop --with-sound \
     --libexecdir=%{_libdir} --infodir=%{infodir} \
     --disable-rename \
-    --with-toolkit=gtk \
+%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-libotf \
-%if %{?_dist_release} == "vl5"
+    --with-m17n-flt \
-      --without-m17n-flt \
+    --with-dbus --with-gconf \
-%endif
-%if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl7"
-      --with-m17n-flt \
-      --with-dbus --with-gconf \
-%endif
     ;
 
 %__make bootstrap
@@ -207,8 +167,8 @@ ARCHDIR=${RPM_ARCH}-vine-linux
 ## This is a duplicate of the file in FLAVOR/site-lisp
 %__rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/subdirs.el || exit 1
 
-(cd $RPM_BUILD_ROOT%{_mandir}/man1/; %__mv ctags.1 gctags.1)
+# (cd $RPM_BUILD_ROOT%{_mandir}/man1/; %__mv ctags.1 gctags.1)
-(cd $RPM_BUILD_ROOT%{_bindir}/; %__mv ctags gctags)
+# (cd $RPM_BUILD_ROOT%{_bindir}/; %__mv ctags gctags)
 
 %__mkdir_p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/etc
 %__mkdir_p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp
@@ -250,9 +210,9 @@ nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tr
 
 ## install system-wide configure file
 %__install -m755 -d ${RPM_BUILD_ROOT}/etc/emacs
-%__install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs23-local.el
+%__install -m644 %{SOURCE20} ${RPM_BUILD_ROOT}/etc/emacs/emacs24-local.el
 %__sed -i -e 's/EMACS_VERSION/%{version}/g' \
-    ${RPM_BUILD_ROOT}/etc/emacs/emacs23-local.el
+    ${RPM_BUILD_ROOT}/etc/emacs/emacs24-local.el
 
 ## Python mode, php mode and rpm-spec mode
 
@@ -285,38 +245,18 @@ LIB=${RPM_BUILD_ROOT}%{_libdir}
 EL="*.el"
 
 ## prepare file list for emacs
-
+echo "/usr/bin/ctags
-echo "/usr/bin/b2m
 /usr/bin/ebrowse
 /usr/bin/etags
 /usr/bin/rcs-checkin
 /usr/bin/emacs
 /usr/bin/emacsclient
-/usr/bin/gctags
 /usr/bin/grep-changelog
 /usr/share/icons/hicolor/scalable/apps/emacs.svg
-/usr/share/icons/hicolor/scalable/mimetypes/emacs-document.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($_)}'  
 
-
-# find ${RPM_BUILD_ROOT}/%{_mandir} -type f |
-# sed -e "s#\.gz##"|
-# sed -e "s#[^\n]*#mv \0.gz \0-emacs-%{version}.gz#"|
-#    awk '{system($_)}'
-
-
-
-
-#find ${RPM_BUILD_ROOT}/%{_infodir} -type f |
-#sed -e "s#\.gz##"|
-#sed -e "s#[^\n]*#mv \0.gz \0-e21.gz#"|
-#    awk '{system($_)}' 
-
-
-
-
-
 find $DIR $BIN $LIB -type d |
   %__sed -e "s#^${RPM_BUILD_ROOT}#%dir #" > rpm-files
 
@@ -352,7 +292,7 @@ if [ "$1" = 1 ]; then
 
 %_addflavorslist emacs-%{version}
 
-export PRIORITY=40
+export PRIORITY=50
 
 %_installemacs emacs-%{version}
 
@@ -361,7 +301,7 @@ fi
 
 if [ "$1" = 2 ]; then
 
-#  export PRIORITY=40
+#  export PRIORITY=50
   
 #  %_installemacs emacs-%{version}
   
@@ -390,7 +330,7 @@ NEWFLAVOR=$(cat /var/lib/emacsen-common/doinstaflavor-emacs)
 
 %_addflavorslist $NEWFLAVOR
 
-export PRIORITY=40
+export PRIORITY=50
 
 %_installemacs $NEWFLAVOR
 
@@ -417,7 +357,7 @@ fi
 
 %_addflavorslist emacs-%{version}
 
-export PRIORITY=40
+export PRIORITY=50
 
 %_installemacs emacs-%{version}
 
@@ -426,77 +366,103 @@ unset PRIORITY
 
 %files -f rpm-files 
 %defattr(-,root,root)
-%doc INSTALL README BUGS ChangeLog
+%doc INSTALL README BUGS ChangeLog COPYING
+#%doc INSTALL.BZR
 %dir %{_sysconfdir}/emacs-%{version}
 %dir %{_sysconfdir}/emacs-%{version}/site-start.d
 %{_sysconfdir}/emacs-%{version}/site-start.d/*.el
-%config(noreplace) %{_sysconfdir}/emacs/emacs23-local.el
+%config(noreplace) %{_sysconfdir}/emacs/emacs24-local.el
 %{_infodir}/*
 # %{_mandir}/*/*
-%{_datadir}/applications/emacs23.desktop
+%{_datadir}/applications/emacs24.desktop
 %{_datadir}/icons/hicolor/*
 # %{_datadir}/emacs-%{version}/site-lisp
 %dir %{_localstatedir}/games/emacs
 %{_localstatedir}/games/emacs/*
 
+
 %changelog
-* Mon Jan 30 2012 Munehiro Yamamoto <munepi@vinelinux.org> 23.4-1
+* Sat May 19 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.97-1
-- update to 23.4
+- updated to 24.0.97 (24.1 pretest)
-
+
-* Sat Jan 21 2012 Munehiro Yamamoto <munepi@vinelinux.org> 23.3-5
+* Sun Apr 29 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.96-1
-- added patch41 to handle CVE-2012-0035: CEDET global-ede-mode file loading 
+- updated to 24.0.96 (24.1 pretest)
-  vulnerability (rhbz#773024)
+
-
+* Mon Apr  2 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.95-1
-* Fri Jan 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 23.3-4
+- updated to 24.0.95 (24.1 pretest)
-- update to 23.3b
+
-- add patch36: Check for _NET_WM_STATE_HIDDEN (rhbz#711739)
+* Sun Mar 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 24.0.94-2
-- add patch37: Initialize xgselect in function xg_select when
+- rebuild with ImageMagick-6.7.5.10
-  gfds_size == 0 (rhbz#751154)
+
-- add patch38: Apply upstream Subversion >= 1.7 dir structure 
+* Mon Feb 27 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.94-1
-  fix for vc-svn.el.
+- updated to 24.0.94 (24.1 pretest)
-- add patch40: use xdg-open for opening URLs
+
-
+* Tue Feb 14 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.93-2
-* Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.3-3
+- use gtk as X toolkit (for vl6)
+
+* Mon Jan 30 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.93-1
+- updated to 24.0.93 (24.1 pretest)
+
+* Thu Dec  1 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.92-1
+- updated to 24.0.92 (24.1 pretest)
+
+* Wed Nov  2 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.91-1
+- updated to 24.0.91 (24.1 pretest)
+
+* Thu Oct  6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.90-2
+- set --with-x-toolkit=gtk3 (%%configure)
+  - added BuildRequires: gtk3-devel
+
+* Mon Sep 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.90-1
+- updated to 24.0.90 (24.1 pretest)
+- applied emacs-24.0.90-libs-termcap.patch
+
+* Sat Jul 09 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-10.20110817
+- emacs24 24.0.50 (20110817) snapshot
+- added BuildRequires: ImageMagick-devel, libSM-devel, libxml2-devel > 2.6.17
+
+* Sun Jun 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-9.20110604
+- emacs24 24.0.50 (20110604) snapshot
+
+* Thu Apr 13 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-8.20110413
+- emacs24 24.0.50 (20110413) snapshot
+
+* 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 a string ", modified for Vine Linux" to the end of emacs-build-system
+  - 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> 23.3-2
+* 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)
 
-* Fri Mar 11 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.3-1
+* Tue Feb 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-5.20110318
-- new upstream release
+- emacs24 24.0.50 (20110318) snapshot
-
-* Tue Mar 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.3-1.rc1
-- updated to 23.3-rc1 (23.3 release candidate)
 
-* Tue Feb 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.2.94-1
+* Tue Feb 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-4.20110222
-- updated to 23.2.94 (23.3 pretest)
+- emacs24 24.0.50 (20110222) snapshot
 - updated site-start.el
   - defined the function drop-vine-default-from-load-path (regex)
 
-* Wed Feb 02 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.2.93-1
+* Sat Jan 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-3.20110128
-- updated to 23.2.93 (23.3 pretest)
+- emacs24 24.0.50 (20110128) snapshot
 
-* Sat Jan 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.2.92-1
+* Sun Jan 02 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-2.20110101
-- updated to 23.2.92 (23.3 pretest)
+- emacs24 24.0.50 (20110101) snapshot
-- 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
+* Sun Dec 05 2010 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-1.20101203
+- emacs24 24.0.50 (20101203) snapshot 
 - applied new vine-default system
   - updated site-start.el
   - updated vine-default-{base,faces}.el
   - dropped showvdefaultemacs
     - merged to emacsen-common package as show-vine-default.sh
-  - renamed local wide configration file to emacs23-local.el
+  - renamed local wide configration file to emacs24-local.el
 - updated menu-tree.el to version 0.97
-- updated emacs23.desktop.in and menu-tree-init.el.emacs23, little
+- added Provides: emacs-snapshot
 
 * Sat Oct 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.2-4
 - updated vine-default-base.el

e/emacs/emacs23.desktop.in → e/emacs/emacs24.desktop.in

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

e/emacs/site-start.el.emacs23 → e/emacs/site-start.el.emacs24

@@ -84,12 +84,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/emacs23-local.el"))
+(if (file-exists-p (expand-file-name "/etc/emacs/emacs24-local.el"))
-    (load (expand-file-name "/etc/emacs/emacs23-local.el")))
+    (load (expand-file-name "/etc/emacs/emacs24-local.el")))
 
 ;;; load vine-default configuration per user before vine-default-setup
-(if (file-exists-p (expand-file-name "~/.emacs.d/emacs23-vine-default.el"))
+(if (file-exists-p (expand-file-name "~/.emacs.d/emacs24-vine-default.el"))
-    (load (expand-file-name "~/.emacs.d/emacs23-vine-default.el")))
+    (load (expand-file-name "~/.emacs.d/emacs24-vine-default.el")))
 
 ;;; run vine-default-setup
 (vine-default-setup)

e/emacs/vine-default-base.el

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  -*- coding: utf-8-unix -*-
-;;  FSF Emacs 23 用 Vine Linux 基本設定
+;;  FSF Emacs 24 用 Vine Linux 基本設定
 ;;    Munehiro Yamamoto <munepi@vinelinux.org>
 ;;	$Id: vine-default-base.el,v 1.4 2010/01/04 11:21:29 munepi Exp $
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

e/emacs/vine-default-faces.el

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;  -*- coding: utf-8-unix -*-
-;;  FSF Emacs 23 用 Vine Linux フォント/カラー設定
+;;  FSF Emacs 24 用 Vine Linux フォント/カラー設定
 ;;    Munehiro Yamamoto <munepi@vinelinux.org>
 ;;	$Id: vine-default-faces.el,v 1.11 2009/07/25 14:04:04 munepi Exp $	
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;