[xemacs-packages-extra] Update to new package release. Drop upstreamed -aspellenc, -auctex-cvs-keywords, -browsers, -risky,
Jerry James
jjames at fedoraproject.org
Mon Jul 7 18:58:10 UTC 2014
commit 4b324f6b59b84fd766eba38fab45af6c9665dc29
Author: Jerry James <jamesjer at betterlinux.com>
Date: Mon Jul 7 12:58:09 2014 -0600
Update to new package release.
Drop upstreamed -aspellenc, -auctex-cvs-keywords, -browsers, -risky, and
-texi patches.
Update checkout script for mercurial.
.gitignore | 2 +-
sources | 2 +-
...-packages-extra-20060510-aspellenc-190151.patch | 15 -
...ckages-extra-20090217-auctex-cvs-keywords.patch | 54 -
xemacs-packages-extra-20090217-browsers.patch | 37 -
xemacs-packages-extra-20121228-risky.patch | 12 -
xemacs-packages-extra-20130408-texi.patch | 3256 --------------------
xemacs-packages-extra-checkout.sh | 35 +-
xemacs-packages-extra.spec | 47 +-
9 files changed, 34 insertions(+), 3426 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7fb44d..60bd982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/xemacs-packages-extra-20130408.tar.xz
+/xemacs-packages-extra-20140705.tar.xz
diff --git a/sources b/sources
index 7aa3e9f..5d46d48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b90b8b7b20ca3d62f249d40579a07e13 xemacs-packages-extra-20130408.tar.xz
+474d4dbdfc484d554ad3cf3c50a7c1fd xemacs-packages-extra-20140705.tar.xz
diff --git a/xemacs-packages-extra-checkout.sh b/xemacs-packages-extra-checkout.sh
index 51b63e3..d17ea6f 100755
--- a/xemacs-packages-extra-checkout.sh
+++ b/xemacs-packages-extra-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,20 +13,15 @@ cleanup() {
}
unset CDPATH
-pwd=$(pwd)
+pwd=$PWD
date=$1
-tag=sumo-$date
+tag=$2
tarball=xemacs-packages-extra-${date//-/}
-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)
-
-cd $tmp
-
-cvs -z3 checkout -r $tag packages
-cd packages
-
-cp Local.rules.template Local.rules
+pushd $tmp > /dev/null
+hg clone https://bitbucket.org/xemacs/xemacs-packages
+cd xemacs-packages
+cp -p Local.rules.template Local.rules
# Not useful on Linux
rm -rf xemacs-packages/Sun
@@ -38,18 +33,18 @@ rm -rf xemacs-packages/liece
# Not included in upstream Sumo
rm -rf xemacs-packages/ess
-# Shouldn't ship this
+# Shouldn't ship this for trademark reasons
rm -f xemacs-packages/games/tetris.el
sed -i -e 's/ tetris.elc//' xemacs-packages/games/Makefile
sed -i -e 's/ tetris//' -e 's/Tetris, //' xemacs-packages/games/package-info.in
# Clean up
find . -name "*.jar" -o -name "*.class" -delete
-find . -name .cvsignore -o -name CVS | xargs rm -rf
+find . -name .hg\* | xargs rm -fr
+# Make the tarball
cd ..
-mv packages $tarball
+mv xemacs-packages $tarball
tar cf $pwd/$tarball.tar $tarball
-xz -f $pwd/$tarball.tar
-
-cd $pwd >/dev/null
+xz -9f $pwd/$tarball.tar
+popd > /dev/null
diff --git a/xemacs-packages-extra.spec b/xemacs-packages-extra.spec
index a47822e..005cca0 100644
--- a/xemacs-packages-extra.spec
+++ b/xemacs-packages-extra.spec
@@ -1,10 +1,11 @@
+%global hgver 677ab9454a39
%global pkgdir %{_datadir}/xemacs
%global xemver %(pkg-config --modversion xemacs 2>/dev/null || echo 0)
-%global basever 20130408
+%global basever 20140705
Name: xemacs-packages-extra
-Version: 20130408
-Release: 4%{?dist}
+Version: 20140705
+Release: 1%{?dist}
Summary: Collection of XEmacs lisp packages
Group: Applications/Editors
@@ -22,24 +23,14 @@ Source16: Emacs.ad.zh_CN.UTF-8
Source17: Emacs.ad.zh_TW.UTF-8
Source99: %{name}-checkout.sh
-# 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
+Patch0: %{name}-20060510-trax.patch
# catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
-Patch2: %{name}-20060510-avoid-catch-error-65346.patch
+Patch1: %{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
+Patch2: %{name}-20060510-egg-wnn-host-unix-79826.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
-# do not use the unsupported :risky keyword to defcustom
-Patch7: %{name}-20121228-risky.patch
-# fix problems with texinfo 5
-Patch8: %{name}-20130408-texi.patch
+Patch3: %{name}-20090217-auctex-texjp-platex.patch
BuildArch: noarch
BuildRequires: xemacs >= 21.5.30
@@ -93,16 +84,8 @@ collection in GNU texinfo format
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8
-chmod -c -x \
- xemacs-packages/auctex/style/babel.el \
- xemacs-packages/ede/ede-proj-comp.el \
- xemacs-packages/vm/lisp/vm-version.el
+chmod -c -x xemacs-packages/auctex/style/babel.el
cat << EOF > make.sh
#!/bin/sh
@@ -114,7 +97,7 @@ make \\
EOF
chmod +x make.sh
-sed -i -e 's|/usr/local/bin/perl5\?|/usr/bin/perl|g' \
+sed -i -e 's|/usr/local/bin/perl5\?|%{_bindir}/perl|g' \
xemacs-packages/bbdb/utils/*.pl xemacs-packages/hyperbole/file-newer
@@ -192,9 +175,7 @@ find $RPM_BUILD_ROOT%{pkgdir} -type f -name '*.info*' | xargs gzip -9
# separate files
rm -f *.files
-echo "%%defattr(-,root,root,-)" > base-files
-echo "%%defattr(-,root,root,-)" > el-files
-echo "%%defattr(-,root,root,-)" > info-files
+touch base-files el-files info-files
find $RPM_BUILD_ROOT%{pkgdir}/* \
\( -type f -name '*.el.orig' -exec rm '{}' ';' \) -o \
@@ -226,6 +207,12 @@ sed -i -e 's/^\(.*[_-]ja\.info.*\)$/%lang(ja) \1/' info-files
%changelog
+* Mon Jul 7 2014 Jerry James <loganjerry at gmail.com> - 20140705-1
+- Update to new package release
+- Drop upstreamed -aspellenc, -auctex-cvs-keywords, -browsers, -risky, and
+ -texi patches
+- Update checkout script for mercurial
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20130408-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list