Fri Mar 6 23:08:41 UTC 2009

Author: scop

Update of /cvs/pkgs/rpms/xemacs-packages-extra/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3649

Modified Files:
	.cvsignore sources xemacs-packages-extra-checkout.sh 
	xemacs-packages-extra.spec 
Added Files:
	xemacs-packages-extra-20090217-auctex-cvs-keywords.patch 
	xemacs-packages-extra-20090217-auctex-texjp-platex.patch 
	xemacs-packages-extra-20090217-browsers.patch 
	xemacs-packages-extra-20090217-vc-menu.patch 
Removed Files:
	xemacs-packages-extra-20060510-auctex-texjp-platex.patch 
	xemacs-packages-extra-20060510-auctex-texsite-jlatex-detect-69129.patch 
	xemacs-packages-extra-20060510-hypb-posix.patch 
	xemacs-packages-extra-20070427-CVE-2008-2142.patch 
	xemacs-packages-extra-20070427-browsers.patch 
	xemacs-packages-extra-20070427-jp-locale-239394.patch 
	xemacs-packages-extra-20070427-rpmspec.patch 
Log Message:
* Sat Mar  7 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 20090217-1
- Update to 2009-02-17, several patches applied/superseded upstream.
- Apply upstream patch to fix errors and obsolete code in VC menu.
- Drop xemacs-sumo* provides and obsoletes and apel-xemacs obsoletes.
- Drop support for building with xemacs < 21.5.28-11.


xemacs-packages-extra-20090217-auctex-cvs-keywords.patch:

--- NEW FILE xemacs-packages-extra-20090217-auctex-cvs-keywords.patch ---
diff -up xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/latex/preview.dtx~ xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/latex/preview.dtx
--- xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/latex/preview.dtx~	2008-09-10 00:47:21.000000000 +0300
+++ xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/latex/preview.dtx	2009-02-26 19:12:22.000000000 +0200
@@ -437,12 +437,12 @@
 \NeedsTeXFormat{LaTeX2e} \def\reserved at a #1#2$#3:
 #4${\xdef#1{\reserved at c #2#4 $}} \def\reserved at c #1 #2${#1}
 \begingroup \catcode`\_=12
-\reserved at a\pr at version $Name: sumo-2009-02-17 $ \ifx\pr at version\@empty
-\reserved at a\pr at version CVS-$Revision: 1.1.2.1 $ \endgroup \else
+\reserved at a\pr at version $Name: release_11_84 $ \ifx\pr at version\@empty
+\reserved at a\pr at version CVS-$Revision: 1.122 $ \endgroup \else
   \def\next release_{} \lccode`\_=`.
   \edef\next{\lowercase{\endgroup
     \def\noexpand\pr at version{\expandafter\next\pr at version}}} \next \fi
-\reserved at a\next $Date: 2008/09/09 21:47:21 $
+\reserved at a\next $Date: 2006/08/25 10:34:36 $
 \edef\next{\noexpand\ProvidesPackage{preview}%
   [\next\space \pr at version\space (AUCTeX/preview-latex)]}
 \next
diff -up xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/preview.el~ xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/preview.el
--- xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/preview.el~	2008-09-10 00:45:58.000000000 +0300
+++ xemacs-packages-extra-20090217/xemacs-packages/auctex/preview/preview.el	2009-02-26 19:14:50.000000000 +0200
@@ -3511,8 +3511,8 @@ internal parameters, STR may be a log to
 	     (preview-reraise-error process)))))
 
 (defconst preview-version (eval-when-compile
-  (let ((name "$Name: sumo-2009-02-17 $")
-	(rev "$Revision: 1.1.2.1 $"))
+  (let ((name "$Name: release_11_84 $")
+	(rev "$Revision: 1.279 $"))
     (or (when (string-match "\\`[$]Name: *release_\\([^ ]+\\) *[$]\\'" name)
 	  (setq name (match-string 1 name))
 	  (while (string-match "_" name)
@@ -3526,7 +3526,7 @@ If not a regular release, CVS revision o
 
 (defconst preview-release-date
   (eval-when-compile
-    (let ((date "$Date: 2008/09/09 21:45:58 $"))
+    (let ((date "$Date: 2006/10/24 16:02:21 $"))
       (string-match
        "\\`[$]Date: *\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)"
        date)
diff -up xemacs-packages-extra-20090217/xemacs-packages/auctex/style/prosper.el~ xemacs-packages-extra-20090217/xemacs-packages/auctex/style/prosper.el
--- xemacs-packages-extra-20090217/xemacs-packages/auctex/style/prosper.el~	2008-09-10 00:55:11.000000000 +0300
+++ xemacs-packages-extra-20090217/xemacs-packages/auctex/style/prosper.el	2009-02-26 19:16:38.000000000 +0200
@@ -62,7 +62,7 @@
 
 
 (defconst LaTeX-prosper-version
-  "$Id: prosper.el,v 1.1.2.1 2008/09/09 21:55:11 matsl Exp $"
+  "$Id: prosper.el,v 1.3 2004/05/10 09:04:14 angeli Exp $"
   "prosper.el version.")
 
 (defconst LaTeX-prosper-transition-styles '("Split"

xemacs-packages-extra-20090217-auctex-texjp-platex.patch:

--- NEW FILE xemacs-packages-extra-20090217-auctex-texjp-platex.patch ---
diff -up xemacs-packages-extra-20090217/xemacs-packages/auctex/tex-jp.el~ xemacs-packages-extra-20090217/xemacs-packages/auctex/tex-jp.el
--- xemacs-packages-extra-20090217/xemacs-packages/auctex/tex-jp.el~	2008-07-23 10:12:18.000000000 +0300
+++ xemacs-packages-extra-20090217/xemacs-packages/auctex/tex-jp.el	2009-02-22 21:30:17.000000000 +0200
@@ -157,7 +157,7 @@ For detail, see `TeX-command-list', whic
   :type 'string)
   (make-variable-buffer-local 'japanese-TeX-command-default)
 
-(defcustom japanese-LaTeX-command-default "LaTeX"
+(defcustom japanese-LaTeX-command-default "pLaTeX"
   "*The default command for `TeX-command' in the japanese-LaTeX mode."
   :group 'AUCTeX-jp
   :type 'string)

xemacs-packages-extra-20090217-browsers.patch:

--- NEW FILE xemacs-packages-extra-20090217-browsers.patch ---
diff -up xemacs-packages-extra-20090217/xemacs-packages/psgml/psgml-html.el~ xemacs-packages-extra-20090217/xemacs-packages/psgml/psgml-html.el
--- xemacs-packages-extra-20090217/xemacs-packages/psgml/psgml-html.el~	2007-05-29 18:56:55.000000000 +0300
+++ xemacs-packages-extra-20090217/xemacs-packages/psgml/psgml-html.el	2009-02-22 21:27:24.000000000 +0200
@@ -931,25 +931,25 @@ get those characters to appear literally
 
 (defvar sgml-html-menu
   (cons "HTML"
-	(append '(["View in Netscape" sgml-html-netscape-file
-		   (buffer-file-name
-		    (current-buffer))]
-		  ["View in W3" w3-preview-this-buffer t]
-		  ["View in kfm" sgml-html-kfm-file
+	(append '(["View in default browser" browse-url-of-buffer t]
+		  ["View in Firefox" sgml-html-netscape-file
+		   (buffer-file-name (current-buffer))]
+		  ["View in Konqueror" sgml-html-kfm-file
 		   (buffer-file-name (current-buffer))]
+		  ["View in W3" w3-preview-this-buffer t]
 		  "---"
 		  ["HTML-Quote Region" html-quote-region t]
 		  "---")
 		(cdr sgml-main-menu))))
 
 (defun sgml-html-netscape-file ()
-  "Preview the file for the current buffer in Netscape."
+  "Preview the file for the current buffer in Firefox."
   (interactive)
-  (browse-url-netscape
+  (browse-url-firefox
    (concat "file:" (buffer-file-name (current-buffer)))))
 
 (defun sgml-html-kfm-file ()
-  "Preview the file for the current buffer in kfm."
+  "Preview the file for the current buffer in Konqueror."
   (interactive)
   (browse-url-kde
    (concat "file:" (buffer-file-name (current-buffer)))))

xemacs-packages-extra-20090217-vc-menu.patch:

--- NEW FILE xemacs-packages-extra-20090217-vc-menu.patch ---
Index: xemacs-packages/vc/vc-hooks.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vc/vc-hooks.el,v
retrieving revision 1.15
diff -u -r1.15 vc-hooks.el
--- xemacs-packages/vc/vc-hooks.el	28 Oct 2007 17:46:57 -0000	1.15
+++ xemacs-packages/vc/vc-hooks.el	28 Feb 2009 23:12:02 -0000
@@ -935,7 +935,7 @@
 (defconst vc-menu
   '("Version Control"
     :filter vc-menu-filter
-    [""                           vc-next-action          buffer-file-name nil]
+    ["Next Action on"             vc-next-action          buffer-file-name nil]
     ["Update to Latest Version"   vc-update               vc-mode]
     ["Revert to Base Version"     vc-revert-buffer        vc-mode]
     ["Undo Last Check-In"         vc-cancel-version       vc-mode]
@@ -956,48 +956,15 @@
 
 (defun vc-menu-filter (menu-items)
   (let* ((result menu-items)		; modify in-place
-	 (case-fold-search t)
-	 (type (vc-backend buffer-file-name))
 	 ;; VC works with full path!
-	 (file (if buffer-file-name
-		   buffer-file-name
-		 (expand-file-name (buffer-name))))
-	 op owner item status)
-    (setq op (cond ((null type)
-		    "Register File")
-		   ((eq type 'CVS)
-		    (setq status
-			  (vc-file-getprop buffer-file-name 'cvs-status))
-		    (if status
-			(cdr (assoc status
-				    '(("Locally Modified" . "Commit")
-				      ("Needs Merge" . "Merge with repository")
-				      ("Up-to-date" . "Do nothing to")
-				      ("Needs Checkout" . "Update"))))
-		      ;; #### - we're not gonna call cvs status just to
-		      ;; post a lousy menu...that's insane!
-		      "Next action on" 
-		      ))
-		   ;; these are all for RCS and SCCS
-		   ((not (setq owner (vc-locking-user file)))
-		    ;; VC locking user is faster now. vc-file-owner
-		    ;; is superceded by incompatible FSF version (JV).
-		    "Check out File")
-		   ((not (string-equal owner (user-login-name)))
-		    "Steal File Lock")
-		   (t "Check in File")))
+	 (file (or buffer-file-name (expand-file-name (buffer-name))))
+	 item)
     ;; We do not want the full name in the menu
     (setq file (file-name-nondirectory file))
     (while (setq item (pop menu-items))
       (and (vectorp item)
-	   (cond ((eq 'vc-next-action (aref item 1))
-		  (aset item 0 op)
-		  (aset item 3 file))
-		 ((eq 'vc-file-status (aref item 1))
-		  (aset item 2 (eq 'CVS type))
-		  (aset item 3 file))
-		 ((> (length item) 3)
-		  (aset item 3 file)))))
+	   (> (length item) 3)
+	   (aset item 3 file)))
     result))
 
 (and (featurep 'menubar)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 May 2007 18:28:32 -0000	1.4
+++ .cvsignore	6 Mar 2009 23:08:10 -0000	1.5
@@ -1 +1 @@
-xemacs-packages-extra-20070427.tar.bz2
+xemacs-packages-extra-20090217.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 May 2007 18:28:32 -0000	1.4
+++ sources	6 Mar 2009 23:08:10 -0000	1.5
@@ -1 +1 @@
-f5948a3652f58d0234dddba567d9c59a  xemacs-packages-extra-20070427.tar.bz2
+8cb0e0bcd7410fadd0384206467581ef  xemacs-packages-extra-20090217.tar.lzma


Index: xemacs-packages-extra-checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra-checkout.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs-packages-extra-checkout.sh	10 Sep 2006 09:38:39 -0000	1.1
+++ xemacs-packages-extra-checkout.sh	6 Mar 2009 23:08:10 -0000	1.2
@@ -43,16 +43,13 @@
 sed -i -e 's/ tetris.elc//' xemacs-packages/games/Makefile
 sed -i -e 's/ tetris//' xemacs-packages/games/package-info.in
 
-# Fix up interpreters
-sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
-  xemacs-packages/bbdb/utils/*.pl
-
 # Clean up
 find . -name "*.jar" -o -name "*.class" -delete
 find . -name .cvsignore -o -name CVS | xargs rm -rf
 
 cd ..
 mv packages $tarball
-tar jcf $pwd/$tarball.tar.bz2 $tarball
+tar cf $pwd/$tarball.tar $tarball
+lzma -f $pwd/$tarball.tar
 
 cd $pwd >/dev/null


Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xemacs-packages-extra.spec	26 Feb 2009 08:29:30 -0000	1.8
+++ xemacs-packages-extra.spec	6 Mar 2009 23:08:10 -0000	1.9
@@ -1,16 +1,16 @@
-%define pkgdir  %{_datadir}/xemacs
-%define xemver  v=$(rpm -q --qf=%%{VERSION} xemacs) ; case $v in 2*) echo $v ;; *) echo 0 ;; esac
+%global pkgdir  %{_datadir}/xemacs
+%global xemver  %(pkg-config --modversion xemacs 2>/dev/null || echo 0)
 
 Name:           xemacs-packages-extra
-Version:        20070427
-Release:        5%{?dist}
+Version:        20090217
+Release:        1%{?dist}
 Summary:        Collection of XEmacs lisp packages
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://www.xemacs.org/Documentation/packageGuide.html
 # Tarball created with Source99
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.lzma
 Source10:       Emacs.ad.ja_JP.eucJP
 Source11:       Emacs.ad.ko_KR.eucKR
 Source12:       Emacs.ad.zh_CN.GB2312
@@ -21,33 +21,33 @@
 Source17:       Emacs.ad.zh_TW.UTF-8
 Source99:       %{name}-checkout.sh
 
-Patch0:         %{name}-20060510-hypb-posix.patch
+# Upstreamed
+Patch0:         %{name}-20090217-auctex-cvs-keywords.patch
 Patch1:         %{name}-20060510-aspellenc-190151.patch
 Patch2:         %{name}-20060510-trax.patch
-Patch3:         %{name}-20060510-auctex-texsite-jlatex-detect-69129.patch
-Patch4:         %{name}-20060510-auctex-texjp-platex.patch
+# Upstreamed
+Patch3:         %{name}-20090217-vc-menu.patch
+Patch4:         %{name}-20090217-auctex-texjp-platex.patch
 Patch5:         %{name}-20060510-egg-wnn-host-unix-79826.patch
-Patch6:         %{name}-20070427-browsers.patch
-Patch7:         %{name}-20070427-jp-locale-239394.patch
+Patch6:         %{name}-20090217-browsers.patch
 Patch8:         %{name}-20060510-avoid-catch-error-65346.patch
-Patch9:         %{name}-20070427-rpmspec.patch
-Patch10:        %{name}-20070427-CVE-2008-2142.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  xemacs
+BuildRequires:  xemacs >= 21.5.28-11
 BuildRequires:  texinfo
+# For building auctex docs
+BuildRequires:  texlive-texmf-latex
 BuildRequires:  tetex
 BuildRequires:  /sbin/install-info
 BuildRequires:  %{__python}
 BuildRequires:  java-devel
+# lzma for unpacking Source0
+BuildRequires:  lzma
 Requires:       xemacs-packages-base = %{version}
-Requires:       xemacs(bin) >= %(%{xemver})
-# Fake release in apel provision in order to avoid self-obsoletion (for now).
+Requires:       xemacs(bin) >= %{xemver}
+# Fake release here for historical reasons
 Provides:       apel-xemacs = 10.6-6
-Obsoletes:      apel-xemacs < 10.6-6
-Provides:       xemacs-sumo = %{version}-%{release}
-Obsoletes:      xemacs-sumo < 20060510-3
 
 %description
 XEmacs is a highly customizable open source text editor and
@@ -66,8 +66,6 @@
 Group:          Development/Libraries
 Requires:       xemacs-packages-extra = %{version}-%{release}
 Requires:       xemacs-packages-base-el = %{version}
-Provides:       xemacs-sumo-el = %{version}-%{release}
-Obsoletes:      xemacs-sumo-el < 20060510-3
 
 %description    el
 This package is not needed to run XEmacs; it contains the lisp source
@@ -78,8 +76,6 @@
 Summary:        XEmacs packages documentation in GNU texinfo format
 Group:          Documentation
 Requires:       xemacs-packages-extra = %{version}-%{release}
-Provides:       xemacs-sumo-info = %{version}-%{release}
-Obsoletes:      xemacs-sumo-info < 20060510-3
 
 %description    info
 This package contains optional documentation for the XEmacs packages
@@ -88,45 +84,47 @@
 
 %prep
 %setup -q
-# get rid of csh dependency
+# fix keywords inadvertently expanded by XEmacs CVS, failing auctex build
 %patch0 -p1
 # adapt ispell.el to aspell >= 0.60's encoding behaviour, #190151
 %patch1 -p1
 # use TrAX by default in xslt-process
 %patch2 -p1
-# fix jlatex autodetection
-%patch3 -p1
+# fix/simplify outdated vc menu
+%patch3 -p0
 # use ptex rather jtex by default for Japanese
 %patch4 -p1
 # make egg-wnn use unix domain socket by default
 %patch5 -p1
 # update browsers in psgml-html
 %patch6 -p1
-# fix -help and splash screen with ja_JP.UTF-8
-%patch7 -p0
 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
 %patch8 -p1
-# rpm-spec-mode improvements
-%patch9 -p0
-# CVE-2008-2142
-%patch10 -p0
 
-[ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
+chmod -c -x \
+    xemacs-packages/auctex/style/babel.el \
+    xemacs-packages/ede/ede-proj-comp.el \
+    xemacs-packages/vm/lisp/vm-version.el
+
 cat << EOF > make.sh
 #!/bin/sh
 make \\
     XEMACS_BINARY=%{_bindir}/xemacs \\
     XEMACS_INSTALLED_PACKAGES_ROOT=\$RPM_BUILD_ROOT%{pkgdir} \\
-    $x215 \\
+    XEMACS_21_5=t \\
     "\$@"
 EOF
 chmod +x make.sh
 
+sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
+  xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer
+
 
 %build
 cd xemacs-packages/xslt-process/java
 javac xslt/TrAX.java && jar cvf xslt.jar xslt/*.class && rm xslt/*.class
 cd -
+./make.sh autoloads
 ./make.sh
 
 
@@ -137,14 +135,16 @@
 ./make.sh install
 
 cd $RPM_BUILD_ROOT%{pkgdir}/mule-packages/etc/app-defaults
-mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,zh_CN,zh_TW}.UTF-8 \
+mkdir {de_DE,fr_FR,ro_RO,ja_JP,ko_KR,sv_SE,zh_CN,zh_TW}.UTF-8 \
   ja_JP.eucJP ko_KR.eucKR zh_CN.GB2312 zh_TW.Big5
 iconv -f ISO-8859-1  -t UTF-8 de/Emacs > de_DE.UTF-8/Emacs
 iconv -f ISO-8859-1  -t UTF-8 fr/Emacs > fr_FR.UTF-8/Emacs
 iconv -f ISO-8859-16 -t UTF-8 ro/Emacs > ro_RO.UTF-8/Emacs
+iconv -f ISO-8859-1  -t UTF-8 sv/Emacs > sv_SE.UTF-8/Emacs
 mv de de_DE
 mv fr fr_FR
 mv ro ro_RO
+mv sv sv_SE
 install -pm 644 %{SOURCE10} ja_JP.eucJP/Emacs
 install -pm 644 %{SOURCE11} ko_KR.eucKR/Emacs
 install -pm 644 %{SOURCE12} zh_CN.GB2312/Emacs
@@ -160,9 +160,6 @@
 #ln -s zh_TW.Big5 zh_TW
 cd -
 
-# Not needed after hypb-posix patch
-rm -f $RPM_BUILD_ROOT%{pkgdir}/xemacs-packages/lisp/hyperbole/file-newer
-
 remove_package() {
     pdir=$RPM_BUILD_ROOT%{pkgdir}/$2
     %{_bindir}/xemacs -batch -vanilla -l package-admin -eval \
@@ -184,9 +181,7 @@
 done
 
 # mule-ucs: not needed (and unusable) with >= 21.5
-if [ ! "%(%{xemver})" '<' "21.5" ] ; then
-    remove_package mule-ucs mule-packages
-fi
+remove_package mule-ucs mule-packages
 
 # info docs: pre-generate "dir"s and compress files
 for file in $RPM_BUILD_ROOT%{pkgdir}/*-packages/info/*.info ; do
@@ -234,6 +229,12 @@
 
 
 %changelog
+* Sat Mar  7 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 20090217-1
+- Update to 2009-02-17, several patches applied/superseded upstream.
+- Apply upstream patch to fix errors and obsolete code in VC menu.
+- Drop xemacs-sumo* provides and obsoletes and apel-xemacs obsoletes.
+- Drop support for building with xemacs < 21.5.28-11.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070427-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- xemacs-packages-extra-20060510-auctex-texjp-platex.patch DELETED ---


--- xemacs-packages-extra-20060510-auctex-texsite-jlatex-detect-69129.patch DELETED ---


--- xemacs-packages-extra-20060510-hypb-posix.patch DELETED ---


--- xemacs-packages-extra-20070427-CVE-2008-2142.patch DELETED ---


--- xemacs-packages-extra-20070427-browsers.patch DELETED ---


--- xemacs-packages-extra-20070427-jp-locale-239394.patch DELETED ---


--- xemacs-packages-extra-20070427-rpmspec.patch DELETED ---


