[xemacs-packages-base] Update to latest package releases. Drop upstreamed -texi patch. Update checkout script for mercurial

[Jerry James]

commit d158f4f1d27021c26b466d4aaaef293da8d6fee4
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Jul 7 12:44:29 2014 -0600

    Update to latest package releases.
    Drop upstreamed -texi patch.
    Update checkout script for mercurial.

 .gitignore                       |    2 +-
 sources                          |    2 +-
 xemacs-packages-base-checkout.sh |   55 ++++++++++++++++++++------------------
 xemacs-packages-base-texi.patch  |   19 -------------
 xemacs-packages-base.spec        |   23 ++++++++-------
 5 files changed, 43 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b79e2b..d27dd64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/xemacs-packages-base-20130408.tar.xz
+/xemacs-packages-base-20140705.tar.xz
diff --git a/sources b/sources
index b60f2e7..1de2791 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c47b60ee0f880434d915ce4f2bd927f  xemacs-packages-base-20130408.tar.xz
+e4ddba877e145a7f6b9e6e634970b705  xemacs-packages-base-20140705.tar.xz
diff --git a/xemacs-packages-base-checkout.sh b/xemacs-packages-base-checkout.sh
index 12a4a7c..1999616 100755
--- a/xemacs-packages-base-checkout.sh
+++ b/xemacs-packages-base-checkout.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/bash -e
 
-if [ -z "$1" ] ; then
-    echo "Usage: $0 date, eg. 2006-05-10"
+if [ "$#" != 2 ]; then
+    echo "Usage: $0 date revision, eg. 2014-06-30 832449bdc11b"
     exit 1
 fi
 
@@ -13,34 +13,37 @@ cleanup() {
 }
 
 unset CDPATH
-pwd=$(pwd)
-date=$1 
-tag=sumo-$date
+pwd=$PWD
+date=$1
+tag=$2
 tarball=xemacs-packages-base-${date//-/}
-cvs="cvs -z3 -d:pserver:cvs at cvs.alioth.debian.org:/cvsroot/xemacs"
 
-# For the checkout to work, first "cvs login" with the above CVSROOT (pass:cvs)
+pushd $tmp > /dev/null
+hg clone https://bitbucket.org/xemacs/xemacs-packages
+cd xemacs-packages
+cp -p Local.rules.template Local.rules
 
-cd $tmp
+# Save the only xemacs-packages dirs we want to build
+mkdir save
+mv xemacs-packages/{Makefile,apel,dired,efs,fsf-compat,xemacs-base} save
+rm -fr xemacs-packages
+mv save xemacs-packages
 
-$cvs export -r $tag package-ctlfile
-cp packages/Local.rules.template packages/Local.rules
-$cvs export -r $tag standard-Makefile mule-Makefile
-pushd packages/xemacs-packages >/dev/null
+# Save the only mule-packages dirs we want to build
+mkdir save
+mv mule-packages/{Makefile,mule-base} save
+rm -fr mule-packages
+mv save mule-packages
 
-# the meat of xemacs-packages-base:
-$cvs export -r $tag efs xemacs-base
-cd ../mule-packages
-$cvs export -r $tag mule-base
+# Break an unneeded build dependency
+sed -i 's/ prog-modes//' xemacs-packages/dired/Makefile
 
-# build dependencies:
-cd ../xemacs-packages
-$cvs export -r $tag apel dired fsf-compat
-sed -i -e 's/ prog-modes//' dired/Makefile
+# Remove the mercurial files
+find . -name .hg\* | xargs rm -fr
 
-popd >/dev/null
-mv packages $tarball
+# Make the tarball
+cd ..
+mv xemacs-packages $tarball
 tar cf $pwd/$tarball.tar $tarball
-xz -f $pwd/$tarball.tar
-
-cd $pwd
+xz -9f $pwd/$tarball.tar
+popd > /dev/null
diff --git a/xemacs-packages-base.spec b/xemacs-packages-base.spec
index d359ada..9040078 100644
--- a/xemacs-packages-base.spec
+++ b/xemacs-packages-base.spec
@@ -1,9 +1,10 @@
-%define pkgdir  %{_datadir}/xemacs
-%define xemver  v=$(rpm -q --qf=%%{VERSION} xemacs-nox) ; case $v in 2*) echo $v ;; *) echo 0 ;; esac
+%global hgver   677ab9454a39
+%global pkgdir  %{_datadir}/xemacs
+%global xemver  v=$(rpm -q --qf=%%{VERSION} xemacs-nox) ; case $v in 2*) echo $v ;; *) echo 0 ;; esac
 
 Name:           xemacs-packages-base
-Version:        20130408
-Release:        3%{?dist}
+Version:        20140705
+Release:        1%{?dist}
 Summary:        Base lisp packages for XEmacs
 
 Group:          Applications/Editors
@@ -13,8 +14,6 @@ URL:            http://www.xemacs.org/Documentation/packageGuide.html
 # Tarball created with Source99
 Source0:        %{name}-%{version}.tar.xz
 Source99:       %{name}-checkout.sh
-# Fix the build with texinfo 5
-Patch0:         %{name}-texi.patch
 
 BuildArch:      noarch
 BuildRequires:  xemacs-nox
@@ -45,14 +44,12 @@ developing or debugging the packages.
 
 %prep
 %setup -q
-%patch0
-[ ! "%(%{xemver})" '<' "21.5" ] && x215="XEMACS_21_5=t" || x215=
 cat << EOF > make.sh
 #!/bin/sh
 make \\
     XEMACS_BINARY=%{_bindir}/xemacs-nox \\
     XEMACS_INSTALLED_PACKAGES_ROOT=\$RPM_BUILD_ROOT%{pkgdir} \\
-    $x215 \\
+    XEMACS_21_5=t \\
     "\$@"
 EOF
 chmod +x make.sh
@@ -76,8 +73,7 @@ mkdir -p $RPM_BUILD_ROOT%{pkgdir}
 
 # separate files
 rm -f *.files
-echo "%%defattr(-,root,root,-)" > base-files
-echo "%%defattr(-,root,root,-)" > el-files
+touch base-files el-files
 
 find $RPM_BUILD_ROOT%{pkgdir}/* \
   \( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
@@ -102,6 +98,11 @@ sed -i -e 's/^\(.*\(\.ja\|-ja\.texi\)\)$/%lang(ja) \1/' base-files
 
 
 %changelog
+* Mon Jul  7 2014 Jerry James <loganjerry at gmail.com> - 20140705-1
+- Update to latest package releases
+- Drop upstreamed -texi patch
+- Update checkout script for mercurial
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20130408-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild