Hello community,
here is the log from the commit of package emacs
checked in at Fri May 25 17:12:08 CEST 2007.
--------
--- emacs/emacs.changes 2007-05-24 18:44:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2007-05-25 11:05:38.000000000 +0200
@@ -1,0 +2,5 @@
+Fri May 25 11:05:14 CEST 2007 - schwab@suse.de
+
+- Fix the broken configure script instead.
+
+-------------------------------------------------------------------
New:
----
emacs-22.0.99-conf.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ emacs.spec ++++++
--- /var/tmp/diff_new_pack.U24079/_old 2007-05-25 17:11:40.000000000 +0200
+++ /var/tmp/diff_new_pack.U24079/_new 2007-05-25 17:11:40.000000000 +0200
@@ -20,7 +20,7 @@
Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc
Autoreqprov: on
Version: 22.0.99
-Release: 4
+Release: 5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: GNU Emacs Base Package
Source: emacs-22.0.99.tar.bz2
@@ -42,6 +42,7 @@
Patch11: emacs-22.0.99-xim.patch
Patch12: emacs-22.0.99-x11r7.patch
Patch13: emacs-22.0.99-s390x.dif
+Patch14: emacs-22.0.99-conf.diff
%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
%if "%_exec_prefix" == "/usr/X11R6"
%define _x11lib %{_exec_prefix}/%{_lib}
@@ -195,7 +196,7 @@
Eric S. Raymond
%prep
-%setup -q -b 0 -b 2
+%setup -q -b 2
%patch1 -p0 -b .axp
%patch2 -p0 -b .glibc
%patch3 -p0 -b .decl
@@ -209,6 +210,7 @@
%patch11 -p0 -b .xim
%patch12 -p0 -b .x11r7
%patch13 -p0 -b .s390x
+%patch14
%patch
if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
install-mh -auto < /dev/null
@@ -222,12 +224,10 @@
fi
VERSION=%{version}
%ifarch noarch
- SYS="--host=%{_host_cpu}-suse-%{_host_os}
- --build=%{_build_cpu}-suse-%{_build_os}
+ SYS="--build=%{_build_cpu}-suse-%{_build_os}
"
%else
- SYS="--host=%{_target_cpu}-suse-%{_host_os}
- --build=%{_target_cpu}-suse-%{_build_os}
+ SYS="--build=%{_target_cpu}-suse-%{_build_os}
"
%endif
CFLAGS="${RPM_OPT_FLAGS} -pipe -fno-strict-aliasing \
@@ -279,16 +279,6 @@
"
%{?suse_update_config}
autoconf
-#
-# autoconf bug in 2.61a
-#
-ver=$(autoconf --version|head -n1)
-if test "${ver##* }" = "2.61a" ; then
- cp configure configure.old
- sed "/^ac_subst_vars='SHELL/,/^.*'$/{ /^$/d; }" < configure.old > configure
- rm -f configure.old
-fi
-#
CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
MALLOC_CHECK_='' make bootstrap
set -- $(src/emacs -batch --eval "(print pure-space-overflow)")
@@ -322,7 +312,6 @@
set +o posix
touch /tmp/bstamp; sleep 3; sync
##
-rm -rf %{buildroot}
VERSION=%{version}
mkdir -p %{buildroot}/usr/bin
install -m755 emacs-nox %{buildroot}/usr/bin/
@@ -3181,6 +3170,8 @@
/usr/share/emacs/%{version}/lisp/xt-mouse.el.gz
%changelog
+* Fri May 25 2007 - schwab@suse.de
+- Fix the broken configure script instead.
* Thu May 24 2007 - werner@suse.de
- Correct target cpu to become conform with RPM_OPT_FLAGS
- Add Workaround for bug in autoconf 2.61a
++++++ emacs-22.0.99-conf.diff ++++++
--- configure.in
+++ configure.in
@@ -198,7 +198,7 @@
AC_CANONICAL_HOST
canonical=$host
-configuration=${host_alias-$host}
+configuration=${host_alias-${build_alias-$host}}
dnl This used to use changequote, but, apart from `changequote is evil'
dnl per the autoconf manual, we can speed up autoconf somewhat by quoting
@@ -1626,7 +1626,6 @@
LIBSOUND="$LIBSOUND $ALSA_LIBS"
CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
- AC_SUBST()
fi
AC_SUBST(CFLAGS_SOUND)
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org