update to 24.3

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

e/emacs/coding-system-init.el.emacs24

@@ -0,0 +1,11 @@
+;;
+;; coding-system-init.el
+;;  set default coding system
+;;
+
+(set-language-environment 'Japanese)
+(prefer-coding-system  'utf-8-unix)
+
+;; Local Variables:
+;; mode: emacs-lisp
+;; End:

e/emacs/emacs-21.1-ppc-nocombreloc.patch

@@ -1,11 +0,0 @@
---- emacs-21.1/src/s/gnu-linux.h.ppc	Fri Nov 23 18:15:03 2001
-+++ emacs-21.1/src/s/gnu-linux.h	Fri Nov 23 18:16:04 2001
-@@ -190,7 +190,7 @@
-    not -z combreloc is the default.  GNU ld ignores unknown -z KEYWORD
-    switches, so this also works with older versions that don't implement
-    -z combreloc.  */
--#define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc
-+#define LD_SWITCH_SYSTEM_TEMACS
- #endif /* __ELF__ */
- 
- /* As of version 1.1.51, Linux did not actually implement SIGIO.

e/emacs/emacs-23.0.60-locallisppath.patch

@@ -1,42 +0,0 @@
-diff -up emacs-23.0.60/Makefile.in.orig emacs-23.0.60/Makefile.in
---- emacs-23.0.60/Makefile.in.orig	2008-08-02 23:11:24.000000000 +0900
-+++ emacs-23.0.60/Makefile.in	2008-09-08 17:01:38.000000000 +0900
-@@ -483,14 +483,14 @@ install-arch-indep: mkdir info install-e
- 	done
- 	-rm -f $(DESTDIR)${lispdir}/subdirs.el
- 	$(srcdir)/update-subdirs $(DESTDIR)${lispdir}
--	if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
-+	if [ -f $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el ]; \
- 	then true; \
- 	else \
- 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
- 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
--	    > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
-+	    > $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el; \
- 	fi
--	chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
-+	chmod a+r $(DESTDIR)${datadir}/emacs-${version}/site-lisp/subdirs.el
- 	-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
- 	then true; \
- 	else \
-@@ -619,7 +619,7 @@ mkdir: FRC
- 	$(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
- 	  $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
- 	  $(DESTDIR)${datadir}/emacs/site-lisp \
--	  $(DESTDIR)${datadir}/emacs/${version}/site-lisp \
-+	  $(DESTDIR)${datadir}/emacs-${version}/site-lisp \
- 	  $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \
- 	  $(DESTDIR)${desktopdir} $${icondirs}
- 
-diff -up emacs-23.0.60/configure.in.orig emacs-23.0.60/configure.in
---- emacs-23.0.60/configure.in.orig	2008-08-29 05:31:27.000000000 +0900
-+++ emacs-23.0.60/configure.in	2008-09-08 06:36:48.000000000 +0900
-@@ -31,7 +31,7 @@ dnl --program-transform-name options
- AC_ARG_PROGRAM
- 
- lispdir='${datadir}/emacs/${version}/lisp'
--locallisppath='${datadir}/emacs/${version}/site-lisp:'\
-+locallisppath='${datadir}/emacs-${version}/site-lisp:'\
- '${datadir}/emacs/site-lisp'
- lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
- etcdir='${datadir}/emacs/${version}/etc'

e/emacs/emacs-24.2.90-locallisppath.patch

@@ -0,0 +1,35 @@
+diff -du emacs-24.2.90/Makefile.in.orig emacs-24.2.90/Makefile.in
+--- emacs-24.2.90/Makefile.in.orig	2012-11-02 09:38:28.000000000 +0900
++++ emacs-24.2.90/Makefile.in	2012-11-25 17:29:49.984788611 +0900
+@@ -551,7 +551,7 @@
+ 	${INSTALL_DATA} leim/leim-list.el $(DESTDIR)${leimdir}/leim-list.el
+ 	-rm -f $(DESTDIR)${lispdir}/subdirs.el
+ 	umask 022; $(srcdir)/build-aux/update-subdirs $(DESTDIR)${lispdir}
+-	subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \
++	subdir=$(DESTDIR)${datadir}/emacs-${version}/site-lisp ; \
+ 	  ${write_subdir}
+ 	subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \
+ 	  ${write_subdir} || true
+@@ -566,7 +566,7 @@
+ 	        ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \
+ 	      done ; \
+ 	    done )
+-	-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
++	-chmod -R a+r $(DESTDIR)${datadir}/emacs-${version} ${COPYDESTS}
+ 
+ # The last chmod isn't needed at present.
+ 
+
+Diff finished.  Sun Nov 25 17:30:06 2012
+diff -du emacs-24.2.90/configure.ac.orig emacs-24.2.90/configure.ac
+--- emacs-24.2.90/configure.ac.orig	2013-01-10 11:38:02.000000000 +0900
++++ emacs-24.2.90/configure.ac	2013-01-22 14:35:55.602083208 +0900
+@@ -40,7 +40,7 @@ dnl See also epaths.h below.
+ lispdir='${datadir}/emacs/${version}/lisp'
+ leimdir='${datadir}/emacs/${version}/leim'
+ standardlisppath='${lispdir}:${leimdir}'
+-locallisppath='${datadir}/emacs/${version}/site-lisp:'\
++locallisppath='${datadir}/emacs-${version}/site-lisp:'\
+ '${datadir}/emacs/site-lisp'
+ lisppath='${locallisppath}:${standardlisppath}'
+ etcdir='${datadir}/emacs/${version}/etc'

e/emacs/emacs24-vl.spec

@@ -1,6 +1,6 @@
-%define emacsversion 24.2
+%define emacsversion 24.3
 #% define bzrdate 20110817
-%define emacsrelease 1%{?bzrdate:.%bzrdate}%{?_dist_release}
+%define emacsrelease 2%{?bzrdate:.%bzrdate}%{?_dist_release}
 %define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
 
 %define _noVersionedDependencies 1
@@ -17,9 +17,9 @@ Name:         emacs
 #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}.tar.xz
 #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}.tar.gz
+Source0:      ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.xz
 Source1:      emacs-snapshot.sh
 
 Source10:     site-start.el.emacs24
@@ -32,27 +32,37 @@ 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.emacs24
+# Source100:    menu-tree-el-%{menutreeelversion}.tar.gz
+# Source101:    menu-tree-init.el.emacs24
+Source102:    coding-system-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
-Patch11:      emacs-23.0.60-locallisppath.patch
-Patch20:      emacs-23.1.90-fixed-resolution.patch
+Patch11:      emacs-24.2.90-locallisppath.patch
+#Patch20:      emacs-23.1.90-fixed-resolution.patch
 Patch30:      emacs-24.0.90-libs-termcap.patch
 
-# Fixed in upstream CVS. (from Fedora)
+# patches from Fedora 
+# rhbz#713600
+Patch107: emacs-spellchecker.patch
+# Fix for emacs bug #922519
+Patch110: emacs-style-change-cb.patch
+# Fix for emacs bug #562719
+Patch111: emacs-bell-dont-work.patch
+# Fix for emacs bug #929353
+Patch112: emacs-gtk-warning.patch
+# Fix for emacs bug #948838
+Patch113: emacs-help-update.patch
+# Fix for emacs bug #13460.
+Patch150: emacs-24.3-hunspell.patch
+# Fix for emacs bug #827033
+Patch151: emacs-24.3-hunspell.2.patch
 
 # security patches (from Debian)
 
-# security patches (from Ubuntu)
-
-# patches from Mandrake
-Patch1001:    emacs-21.1-bzip2.patch.bz2
+#Patch1001:    emacs-21.1-bzip2.patch.bz2
 
 License:      GPLv3+
 Group:        Applications/Editors/Emacs
@@ -110,20 +120,35 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
 
 %setup -q -n emacs-%{version}
 
-%ifarch ppc
-#%patch10 -p1
-%endif
-
 %patch11 -p1
-%patch20 -p1
-%patch30 -p1
+#%patch20 -p1
+#%patch30 -p1
+
+%patch107 -p1 -b .spellchecker
+%patch110 -p1 -b .style-change-cb.patch
+%patch111 -p1 -b .bell-dont-work.patch
+%patch112 -p1 -b .gtk-warning.patch
+%patch113 -p1 -b .help-update.patch
+%patch150 -p1 -b .hunspell
+%patch151 -p1 -b .hunspell.2
 
-%patch1001 -p1
+#%patch1001 -p1
+
+
+# Avoid trademark issues
+grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \
+   && %__mv lisp/Makefile.in.new lisp/Makefile.in || exit 1
+%__rm -f lisp/play/tetris.el lisp/play/tetris.elc || exit 1
 
 #autoconf
 autoreconf -i -I m4
 
 %build
+# Remove unpatched files as all files in the lisp directory are
+# installed.
+%__rm lisp/textmodes/ispell.el.hunspell || exit 1
+%__rm lisp/textmodes/ispell.el.hunspell.2 || exit 1
+%__rm lisp/textmodes/ispell.el.spellchecker || exit 1
 
 export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
 #to find installinfo
@@ -149,16 +174,6 @@ export PATH="$PATH:/sbin:/usr/sbin"
 %__make %{?_smp_mflags}
 
 
-#%define recompile src/emacs -batch --no-init-file --no-site-file -f batch-byte-compile
-
-# recompile patched .el files
-#%{recompile} lisp/mail/mh-utils.el lisp/progmodes/make-mode.el
-
-# bytecompile python-mode, ssl, php-mode and rpm-spec-mode
-#cp %SOURCE12  %SOURCE14 %SOURCE16 %SOURCE17 .
-##%%{recompile} rpm-spec-mode.el php-mode.el ssl.el po-mode.el
-
-
 %install
 [ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
 
@@ -175,14 +190,12 @@ ARCHDIR=${RPM_ARCH}-vine-linux
 
 %__mkdir_p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/etc
 %__mkdir_p  $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp
-# cp %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
-# nkf -w %{SOURCE100} > $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree-utf8.el
-%__tar zxvf %{SOURCE100}
-%__cp -a menu-tree-el-%{menutreeelversion}/menu-tree.el $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
-nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
+# %__tar zxvf %{SOURCE100}
+# %__cp -a menu-tree-el-%{menutreeelversion}/menu-tree.el $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
+# nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
 
 ## vine default
-%__cp -a %{SOURCE150} %{SOURCE151} \
+%__cp -a %{SOURCE150} \
     $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
 
 # The elisp reference manual
@@ -206,10 +219,14 @@ nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tr
 %__install -m 755 -d ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d
 
 # install coding-system init.el
-%__install -m644 %{SOURCE110} \
-    $RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el
-%__ln_s -f %{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el \
-    ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d/60menu-tree-init.el
+# %__install -m644 %{SOURCE101} \
+#     $RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el
+# %__ln_s -f %{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el \
+#     ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d/60menu-tree-init.el
+%__install -m644 %{SOURCE102} \
+    $RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/coding-system-init.el
+%__ln_s -f %{_datadir}/emacs-%{version}/site-lisp/coding-system-init.el \
+    ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d/60coding-system-init.el
 
 ## install system-wide configure file
 %__install -m755 -d ${RPM_BUILD_ROOT}/etc/emacs
@@ -258,12 +275,12 @@ echo "/usr/bin/ctags
 /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($_)}'  
+    awk '{system($_)}'
 
 find $DIR $BIN $LIB -type d |
   %__sed -e "s#^${RPM_BUILD_ROOT}#%dir #" > rpm-files
 
-find $DIR $BIN $LIB -type f |
+find $DIR $BIN $LIB -type f -o -type l |
   %__sed -e "
     s#^${RPM_BUILD_ROOT}\(.*movemail\)#%attr(2755, root, mail) \1#
     s#^${RPM_BUILD_ROOT}##
@@ -385,6 +402,23 @@ unset PRIORITY
 
 
 %changelog
+* Sat May 11 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.3-2
+- dropped some obsolete patches
+- disable menu-tree-el
+  - added coding-system-init.el instead of menu-tree-init.el
+
+* Sat Mar 30 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.3-1
+- new upstream release
+
+* Thu Feb  7 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.2.93-1
+- updated to 24.2.93 (24.3 pretest)
+
+* Mon Jan 14 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.2.92-1
+- updated to 24.2.92 (24.3 pretest)
+
+* Sun Nov 25 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.2.90-1
+- updated to 24.2.90 (24.3 pretest)
+
 * Mon Aug 27 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.2-1
 - new upstream release
 
@@ -433,7 +467,7 @@ unset PRIORITY
 * 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
+* Wed 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
@@ -550,7 +584,7 @@ unset PRIORITY
 * Tue Sep 01 2009 Munehiro Yamamoto <munepi@vinelinux.org> 23.1-4
 - rebuilt to add signature
 
-* Fri Aug 19 2009 Munehiro Yamamoto <munepi@vinelinux.org> 23.1-3
+* Wed Aug 19 2009 Munehiro Yamamoto <munepi@vinelinux.org> 23.1-3
 - added BuildRequires: nkf
 - updated menu-tree-init.el.emacs23
   - fixed menu-tree encoding <BTS:VineLinux:766>
@@ -652,7 +686,7 @@ unset PRIORITY
   CVE-2008-1694: fix insecure temporary file creation in vcdiff script
                  leading to possible symlink attacks
 
-* Tue Jun 25 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 22.2-2
+* Wed Jun 25 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 22.2-2
 - update menu-tree.el
 - add 60menu-tree-init.el to sed coding-system and load menu-tree
 - build with xorg-x11-7.3
@@ -840,7 +874,7 @@ unset PRIORITY
 - [emacs-20.5-1]
 - add desktop-link files for desktop menu.
 
-* Thu Dec 24 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
+* Fri Dec 24 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
 - [emacs-20.4-16]
 - replaced Y2K savvy timezone.{el,elc} with one from brand-new apel-10.0
 
@@ -862,7 +896,7 @@ unset PRIORITY
 - Modified info-dir.
 - Removed -c option from %setup.
 
-* Sun Sep 20 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
+* Mon Sep 20 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
 - fixed XIM support patch
 * Sun Sep 19 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
 - fixed postinst bug and fontset patch

e/emacs/site-start.el.emacs24

@@ -52,9 +52,6 @@ The version of vine-default.")
     (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
     )