[xemacs] New upstream version. Drop upstreamed patches. Running autoconf no longer necessary. Drop conditiona
Jerry James
jjames at fedoraproject.org
Tue Aug 7 04:35:05 UTC 2012
commit 0a18373711d115be41ad88aee8a3dac75832e91a
Author: Jerry James <loganjerry at gmail.com>
Date: Mon Aug 6 22:34:20 2012 -0600
New upstream version.
Drop upstreamed patches.
Running autoconf no longer necessary.
Drop conditionals for ancient versions of Fedora.
Package X versions of lib-src binaries to get gnuclient linked with -lXau.
.gitignore | 2 +-
sources | 2 +-
xemacs-21.5.25-mk-nochk-features.patch | 6 +-
xemacs-21.5.27-no-expdyn-ia64-106744.patch | 16 +-
xemacs-21.5.28-courier-default.patch | 6 +-
xemacs-21.5.29-destdir.patch | 317 ----------------------------
xemacs-21.5.29-x-server.patch | 6 +-
xemacs-21.5.31-get-other-frame.patch | 11 -
xemacs-21.5.31-lib-src.patch | 20 --
xemacs-21.5.31-view-mode.patch | 6 +-
xemacs.spec | 41 +---
11 files changed, 34 insertions(+), 399 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e5004a8..d6be7fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-xemacs-21.5.31.tar.gz
+/xemacs-21.5.32.tar.gz
diff --git a/sources b/sources
index 39e46de..81c0782 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0185fe905d0b8d8d094d9b60cf262d4a xemacs-21.5.31.tar.gz
+6917e21f58094d25d92911d372449fc5 xemacs-21.5.32.tar.gz
diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch
index 1adfa6b..66a2d70 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 2011-04-29 07:31:05.000000000 -0600
-+++ Makefile.in.in 2011-05-03 13:50:06.283333766 -0600
-@@ -391,7 +391,7 @@
+--- ./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
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 225c168..469c8dc 100644
--- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch
+++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch
@@ -1,9 +1,9 @@
---- ./configure.orig 2011-04-29 07:31:38.000000000 -0600
-+++ ./configure 2011-05-03 13:57:42.432352166 -0600
-@@ -14638,7 +14638,10 @@
+--- ./aclocal.m4.orig 2012-08-02 12:38:27.000000000 -0600
++++ ./aclocal.m4 2012-08-06 20:28:23.842705270 -0600
+@@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib
;;
- *)
+ *)
- ld_dynamic_link_flags="${wl}-export-dynamic"
+ dnl avoid -export-dynamic on ia64
+ if test "$xehost_cpu" != "ia64"; then
@@ -12,12 +12,12 @@
;;
esac
fi
---- ./aclocal.m4.orig 2011-04-29 07:31:05.000000000 -0600
-+++ ./aclocal.m4 2011-05-03 13:56:08.899939431 -0600
-@@ -533,7 +533,10 @@
+--- ./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
;;
- *)
+ *)
- ld_dynamic_link_flags="${wl}-export-dynamic"
+ dnl avoid -export-dynamic on ia64
+ if test "$xehost_cpu" != "ia64"; then
diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch
index e8ffe1c..4e9cff4 100644
--- a/xemacs-21.5.28-courier-default.patch
+++ b/xemacs-21.5.28-courier-default.patch
@@ -1,6 +1,6 @@
---- src/faces.c.orig 2011-04-29 07:31:15.000000000 -0600
-+++ src/faces.c 2011-05-03 14:07:19.571887005 -0600
-@@ -2426,7 +2426,7 @@
+--- ./src/faces.c.orig 2012-08-02 12:38:29.000000000 -0600
++++ ./src/faces.c 2012-08-06 20:29:33.659097709 -0600
+@@ -2484,7 +2484,7 @@ complex_vars_of_faces (void)
Fcons
(Fcons
(list1 (device_symbol),
diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch
index ea69c92..f72b399 100644
--- a/xemacs-21.5.29-x-server.patch
+++ b/xemacs-21.5.29-x-server.patch
@@ -1,6 +1,6 @@
---- lisp/x-init.el.orig 2011-04-29 07:31:10.000000000 -0600
-+++ lisp/x-init.el 2011-05-03 14:24:00.865240901 -0600
-@@ -242,7 +242,7 @@
+--- ./lisp/x-init.el.orig 2012-08-02 12:38:28.000000000 -0600
++++ ./lisp/x-init.el 2012-08-06 20:31:09.330411828 -0600
+@@ -154,7 +154,7 @@ it was previously unaware of, the predic
(string-equal "X Consortium" vendor))
;; Ok, we think this could be a Sun keyboard. Run the Sun code.
(x-win-init-sun device))
diff --git a/xemacs-21.5.31-view-mode.patch b/xemacs-21.5.31-view-mode.patch
index 0013c23..98e090d 100644
--- a/xemacs-21.5.31-view-mode.patch
+++ b/xemacs-21.5.31-view-mode.patch
@@ -1,6 +1,6 @@
---- lisp/view-less.el.orig 2011-04-29 07:31:10.000000000 -0600
-+++ lisp/view-less.el 2011-08-05 10:33:22.849657806 -0600
-@@ -103,6 +103,7 @@
+--- ./lisp/view-less.el.orig 2012-08-02 12:38:28.000000000 -0600
++++ ./lisp/view-less.el 2012-08-06 20:32:42.018964626 -0600
+@@ -108,6 +108,7 @@
(defcustom view-mode-line-string " View"
"*String to display in the modeline when View mode is active.
Set this to nil if you don't want a modeline indicator."
diff --git a/xemacs.spec b/xemacs.spec
index f60187d..f33a79d 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -20,8 +20,8 @@
%global majver 21.5
Name: xemacs
-Version: 21.5.31
-Release: 5%{?snap:.%{snap}}%{?dist}
+Version: 21.5.32
+Release: 1%{?snap:.%{snap}}%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
@@ -53,18 +53,11 @@ Patch2: %{name}-21.5.26-utf8-fonts.patch
Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch
# Fedora-specific. Default to courier instead of lucidatypewriter.
Patch4: %{name}-21.5.28-courier-default.patch
-# Applied upstream. Support DESTDIR in the Makefiles.
-Patch5: %{name}-21.5.29-destdir.patch
# Fedora-specific. Recognize the Fedora X server.
-Patch6: %{name}-21.5.29-x-server.patch
+Patch5: %{name}-21.5.29-x-server.patch
# Applied upstream. Give view-mode-line-string a custom group.
-Patch7: %{name}-21.5.31-view-mode.patch
-# Applied upstream. Supply a missing argument to next-frame.
-Patch8: %{name}-21.5.31-get-other-frame.patch
-# Linux-specific patch. Eliminate unnecessary linkage in lib-src binaries.
-Patch9: %{name}-21.5.31-lib-src.patch
+Patch6: %{name}-21.5.31-view-mode.patch
-BuildRequires: autoconf
BuildRequires: sed >= 3.95
BuildRequires: texinfo
BuildRequires: ncurses-devel
@@ -198,9 +191,7 @@ interest when developing or debugging XEmacs itself.
%package info
Summary: XEmacs documentation in GNU texinfo format
Group: Documentation
-%if 0%{?fedora} >= 10
BuildArch: noarch
-%endif
Requires(post): info
Requires(preun): info
@@ -231,9 +222,7 @@ This package contains XEmacs development support files.
%package filesystem
Summary: XEmacs filesystem layout
Group: Applications/Editors
-%if 0%{?fedora} >= 10
BuildArch: noarch
-%endif
%description filesystem
XEmacs is a highly customizable open source text editor and
@@ -257,14 +246,9 @@ sed -i -e /tetris/d lisp/menubar-items.el
%patch4
%patch5
%patch6
-%patch7
-%patch8
-%patch9
sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
-autoconf --force # for DESTDIR and NO-EXPDYN-IA64 patches
-
for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do
iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f
touch -r $f $f.utf8
@@ -280,6 +264,7 @@ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%endif
export CFLAGS
export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule
+export LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed"
# The --with-*dir args can probably go away in the future if/when upstream
# configure learns to honor standard autofoo dirs better.
@@ -330,10 +315,6 @@ mv lib-src/DOC{,-nox}
mv src/xemacs{,-nox-%{xver}}
mv lib-src/config.values{,-nox}
mv Installation{,-nox}
-# grab these from -nox, the X ones may have deps on ALSA, X, etc
-for file in {e,oo}tags gnuserv {fake,move}mail ; do
- mv lib-src/$file{,-mindep}
-done
%endif # nox
# build with Xft
@@ -421,11 +402,6 @@ cat > macros.xemacs << EOF
EOF
%install
-%if %{with nox}
-# restore binaries with less dependencies; note: no -p nor move
-for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done
-%endif
-
make install DESTDIR=$RPM_BUILD_ROOT
%if %{with nox}
@@ -676,6 +652,13 @@ fi
%dir %{_datadir}/xemacs/site-packages/pkginfo
%changelog
+* Mon Aug 6 2012 Jerry James <loganjerry at gmail.com> - 21.5.32-1
+- New upstream version
+- Drop upstreamed patches
+- Running autoconf no longer necessary
+- Drop conditionals for ancient versions of Fedora
+- Package X versions of lib-src binaries to get gnuclient linked with -lXau
+
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 21.5.31-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list