[xemacs] Update to snapshot: fixes bz 1095405 and allows diagnosis of bz 1078159. Update snapshot creating sc
Jerry James
jjames at fedoraproject.org
Thu Jun 5 15:35:38 UTC 2014
commit 8a07256b74dabbfc4af83b64f859e826c834d25c
Author: Jerry James <jamesjer at betterlinux.com>
Date: Thu Jun 5 09:35:30 2014 -0600
Update to snapshot: fixes bz 1095405 and allows diagnosis of bz 1078159.
Update snapshot creating script to use bitbucket and maximally compress.
Don't need to exclude texinfo info files; upstream has dropped them.
.gitignore | 1 +
sources | 2 +-
xemacs-21.5.25-mk-nochk-features.patch | 2 +-
xemacs-21.5.27-no-expdyn-ia64-106744.patch | 2 +-
xemacs-snapshot.sh | 4 ++--
xemacs.spec | 10 +++++++---
6 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5cf4f49..36a65a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/xemacs-21.5.34.tar.gz
+/xemacs-20140605hgacf1c26e3019.tar.xz
diff --git a/sources b/sources
index 08e9a65..04c7317 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e093150724b6e55b14bae21739cfe373 xemacs-21.5.34.tar.gz
+acbecd8dd6a032de44bcdb69b51d5708 xemacs-20140605hgacf1c26e3019.tar.xz
diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch
index 66a2d70..2a0ce92 100644
--- a/xemacs-21.5.25-mk-nochk-features.patch
+++ b/xemacs-21.5.25-mk-nochk-features.patch
@@ -1,6 +1,6 @@
--- ./Makefile.in.in.orig 2012-08-02 12:38:27.000000000 -0600
+++ ./Makefile.in.in 2012-08-06 20:27:16.084145753 -0600
-@@ -393,7 +393,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS
+@@ -394,7 +394,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS
install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch
index 0755992..105ce6d 100644
--- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch
+++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch
@@ -14,7 +14,7 @@
fi
--- ./configure.orig 2012-08-02 12:39:01.000000000 -0600
+++ ./configure 2012-08-06 20:28:23.841705350 -0600
-@@ -14670,7 +14670,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib
+@@ -15007,7 +15007,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib
;;
*)
diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh
index 7e13cd7..51e8eef 100755
--- a/xemacs-snapshot.sh
+++ b/xemacs-snapshot.sh
@@ -22,7 +22,7 @@ pwd=$(pwd)
now=$(date +%Y%m%d)
cd "$tmp"
-hg clone http://hg.debian.org/hg/xemacs/xemacs-beta
+hg clone https://bitbucket.org/xemacs/xemacs-beta
cd xemacs-beta
hg update -r "$rev"
# Hack to avoid needing .hg/ around but still getting xemacs-extra-name right
@@ -30,5 +30,5 @@ hg identify | cut -d " " -f 1 >> version.sh.in # see configure.ac
rm -r .hg*
cd ..
tar cf "$pwd/$tarball" xemacs-beta
-xz -f "$pwd/$tarball"
+xz -9f "$pwd/$tarball"
cd - >/dev/null
diff --git a/xemacs.spec b/xemacs.spec
index 8b6b651..3c223e1 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -16,11 +16,11 @@
%bcond_without modules
%endif
-#global snap 20090311hg4626
+%global snap 20140605hgacf1c26e3019
Name: xemacs
Version: 21.5.34
-Release: 5%{?snap:.%{snap}}%{?dist}
+Release: 6%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
%global majver %(cut -d. -f1-2 <<<%{version})
@@ -435,7 +435,6 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/{cl,widget}.info*
# these clash with other packages
rm -f $RPM_BUILD_ROOT%{_infodir}/info*
-rm -f $RPM_BUILD_ROOT%{_infodir}/texinfo*
rm -f $RPM_BUILD_ROOT%{_infodir}/standards*
rm -f $RPM_BUILD_ROOT%{_infodir}/termcap*
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -659,6 +658,11 @@ fi
%dir %{_datadir}/xemacs/site-packages/pkginfo
%changelog
+* Thu Jun 5 2014 Jerry James <loganjerry at gmail.com> - 21.5.34-6.20140605hgacf1c26e3019
+- Update to snapshot: fixes bz 1095405 and allows diagnosis of bz 1078159
+- Update snapshot creating script to use bitbucket and maximally compress
+- Don't need to exclude texinfo info files; upstream has dropped them
+
* Wed Feb 5 2014 Jerry James <loganjerry at gmail.com> - 21.5.34-5
- Disable XIM by default. It hasn't worked since the release of Fedora 19 due
to a fixed size buffer inside libX11 that is too small (see _XimProtoCreateIC
More information about the scm-commits
mailing list