[xemacs-packages-extra: 21/21] Update to 2010-07-27 package release. New upstream CVS location in checkout script. Drop upstreamed

Fri Aug 13 18:30:22 UTC 2010

commit 8e6cf6656bf36cc5c31a5ba451750fab13b19c42
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Aug 13 12:24:09 2010 -0600

    Update to 2010-07-27 package release.
    New upstream CVS location in checkout script.
    Drop upstreamed patches.
    Renumber remaining patches.

 .gitignore                                         |    2 +-
 sources                                            |    2 +-
 xemacs-packages-extra-20090217-vc-menu.patch       |   69 -
 xemacs-packages-extra-20090624-apel-503185.patch   | 1497 ---------------
 xemacs-packages-extra-20090624-dired-504422.patch  |   25 -
 xemacs-packages-extra-20090824-timer.patch         |   38 -
 ...extra-20091103-ediff-coding-system-532620.patch | 2018 --------------------
 xemacs-packages-extra-checkout.sh                  |    6 +-
 xemacs-packages-extra.spec                         |   71 +-
 9 files changed, 33 insertions(+), 3695 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index bfa65b4..09eebee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xemacs-packages-extra-20090217.tar.lzma
+xemacs-packages-extra-20100727.tar.xz
diff --git a/sources b/sources
index 9b973d0..761b817 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8cb0e0bcd7410fadd0384206467581ef  xemacs-packages-extra-20090217.tar.lzma
+1a2379bc5f31fca9df25cc0e8f568c70  xemacs-packages-extra-20100727.tar.xz
diff --git a/xemacs-packages-extra-checkout.sh b/xemacs-packages-extra-checkout.sh
index d66bc50..e159148 100755
--- a/xemacs-packages-extra-checkout.sh
+++ b/xemacs-packages-extra-checkout.sh
@@ -14,10 +14,10 @@ cleanup() {
 
 unset CDPATH
 pwd=$(pwd)
-date=$1 
+date=$1
 tag=sumo-$date
 tarball=xemacs-packages-extra-${date//-/}
-export CVSROOT=:pserver:cvs at cvs.xemacs.org:/pack/xemacscvs
+export CVSROOT=:pserver:cvs at cvs.alioth.debian.org:/cvsroot/xemacs
 
 # For the checkout to work, first "cvs login" with the above CVSROOT (pass:cvs)
 
@@ -50,6 +50,6 @@ find . -name .cvsignore -o -name CVS | xargs rm -rf
 cd ..
 mv packages $tarball
 tar cf $pwd/$tarball.tar $tarball
-lzma -f $pwd/$tarball.tar
+xz -f $pwd/$tarball.tar
 
 cd $pwd >/dev/null
diff --git a/xemacs-packages-extra.spec b/xemacs-packages-extra.spec
index 3e961fc..ab684a1 100644
--- a/xemacs-packages-extra.spec
+++ b/xemacs-packages-extra.spec
@@ -2,15 +2,15 @@
 %global xemver  %(pkg-config --modversion xemacs 2>/dev/null || echo 0)
 
 Name:           xemacs-packages-extra
-Version:        20090217
-Release:        8%{?dist}
+Version:        20100727
+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.lzma
+Source0:        %{name}-%{version}.tar.xz
 Source10:       Emacs.ad.ja_JP.eucJP
 Source11:       Emacs.ad.ko_KR.eucKR
 Source12:       Emacs.ad.zh_CN.GB2312
@@ -21,36 +21,32 @@ Source16:       Emacs.ad.zh_CN.UTF-8
 Source17:       Emacs.ad.zh_TW.UTF-8
 Source99:       %{name}-checkout.sh
 
-# Upstreamed
-Patch0:         %{name}-20090217-auctex-cvs-keywords.patch
-Patch1:         %{name}-20060510-aspellenc-190151.patch
-Patch2:         %{name}-20060510-trax.patch
-# Upstreamed
-Patch3:         %{name}-20090217-vc-menu.patch
-Patch4:         %{name}-20090217-auctex-texjp-platex.patch
-Patch5:         %{name}-20060510-egg-wnn-host-unix-79826.patch
+# adapt ispell.el to aspell >= 0.60's encoding behaviour, #190151
+Patch0:         %{name}-20060510-aspellenc-190151.patch
+# use TrAX by default in xslt-process
+Patch1:         %{name}-20060510-trax.patch
+# catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
+Patch2:         %{name}-20060510-avoid-catch-error-65346.patch
+# make egg-wnn use unix domain sockets by default
+Patch3:         %{name}-20060510-egg-wnn-host-unix-79826.patch
+# fix keywords inadvertently expanded by XEmacs CVS, failing auctex build
+Patch4:         %{name}-20090217-auctex-cvs-keywords.patch
+# use ptex rather than jtex by default for Japanese
+Patch5:         %{name}-20090217-auctex-texjp-platex.patch
+# update browsers in psgml-html
 Patch6:         %{name}-20090217-browsers.patch
-# This patch has been applied upstream
-Patch7:         %{name}-20091103-ediff-coding-system-532620.patch
-Patch8:         %{name}-20060510-avoid-catch-error-65346.patch
-# This patch has been applied upstream
-Patch9:         %{name}-20090624-apel-503185.patch
-# This patch has been applied upstream
-Patch10:        %{name}-20090624-dired-504422.patch
-# This patch has been applied upstream
-Patch11:        %{name}-20090824-timer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  xemacs >= 21.5.28-11
+BuildRequires:  xemacs >= 21.5.29-11
 BuildRequires:  texinfo
 # For building auctex docs
 BuildRequires:  tex(latex)
-BuildRequires:  /sbin/install-info
+BuildRequires:  info
 BuildRequires:  %{__python}
 BuildRequires:  java-devel
-# lzma for unpacking Source0
-BuildRequires:  lzma
+# xz for unpacking Source0
+BuildRequires:  xz
 Requires:       xemacs-packages-base = %{version}
 Requires:       xemacs(bin) >= %{xemver}
 # Fake release here for historical reasons
@@ -64,7 +60,7 @@ GNU Emacs.  Its emphasis is on modern graphical user interface support
 and an open software development model, similar to Linux.
 
 The XEmacs packages collection contains a large collection of useful
-lisp packages for XEmacs including mailreaders, programming modes and
+lisp packages for XEmacs including mail readers, programming modes and
 utilities, and packages related to using XEmacs in multi-lingual
 environments.
 
@@ -91,30 +87,13 @@ collection in GNU texinfo format
 
 %prep
 %setup -q
-# 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/simplify outdated vc menu
-%patch3 -p0
-# use ptex rather jtex by default for Japanese
+%patch3 -p1
 %patch4 -p1
-# make egg-wnn use unix domain socket by default
 %patch5 -p1
-# update browsers in psgml-html
 %patch6 -p1
-# fix an Emacs-only coding system that leaked into the ediff code
-%patch7
-# catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
-%patch8 -p1
-# upgrade to a newer APEL (needed by some external packages)
-%patch9
-# fix "no file at point" errors in dired
-%patch10
-# fix a parameter gaffe in the timer code
-%patch11
 
 chmod -c -x \
     xemacs-packages/auctex/style/babel.el \
@@ -249,6 +228,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 12 2010 Jerry James <loganjerry at gmail.com> - 20100727-1
+- Update to new package release.
+- New upstream CVS location in checkout script.
+- Drop upstreamed patches.
+- Renumber remaining patches.
+
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 20090217-8
 - recompiling .py files against Python 2.7 (rhbz#623419)
 
