OBS User unknown 2007-06-18 14:48:47 +00:00 committed by Git OBS Bridge
parent f3ed069c48
commit cb6465ae7f
2 changed files with 24 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 18 13:39:00 CEST 2007 - werner@suse.de
- Use the app-default file macro, avoid empty MALLOC_CHECK_
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 4 17:32:44 CEST 2007 - werner@suse.de Mon Jun 4 17:32:44 CEST 2007 - werner@suse.de

View File

@ -20,7 +20,7 @@ Requires: emacs-info ctags emacs_program
Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc Provides: ge_site ge_exec emacs-url Mule-UCS emacs-calc erc
Autoreqprov: on Autoreqprov: on
Version: 22.1 Version: 22.1
Release: 1 Release: 7
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: GNU Emacs Base Package Summary: GNU Emacs Base Package
Source: emacs-22.1.tar.bz2 Source: emacs-22.1.tar.bz2
@ -278,9 +278,22 @@ export CC CFLAGS LANG LC_CTYPE LDFLAGS
--with-system-malloc \ --with-system-malloc \
" "
%{?suse_update_config} %{?suse_update_config}
malloc_chk_off ()
{
local ret
local OMC=$MALLOC_CHECK_
unset MALLOC_CHECK_
${1+"$@"}
ret=$?
if test -n "$OMC" ; then
MALLOC_CHECK_=$OMC
export MALLOC_CHECK_
fi
return $ret
}
autoconf autoconf
CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS} CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
MALLOC_CHECK_='' make bootstrap malloc_chk_off make bootstrap
set -- $(src/emacs -batch --eval "(print pure-space-overflow)") set -- $(src/emacs -batch --eval "(print pure-space-overflow)")
test "$1" = "nil" || exit 1 test "$1" = "nil" || exit 1
# #
@ -294,7 +307,7 @@ cp src/emacs emacs-nox
make distclean make distclean
# #
CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${X11} ${SYS} CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${X11} ${SYS}
MALLOC_CHECK_='' make bootfast malloc_chk_off make bootfast
set -- $(src/emacs -batch --eval "(print pure-space-overflow)") set -- $(src/emacs -batch --eval "(print pure-space-overflow)")
test "$1" = "nil" || exit 1 test "$1" = "nil" || exit 1
cd ../site-lisp/ cd ../site-lisp/
@ -2068,7 +2081,7 @@ done
%files -n emacs-x11 %files -n emacs-x11
%defattr(-, root, root) %defattr(-, root, root)
/usr/bin/emacs /usr/bin/emacs
/usr/share/X11/app-defaults/Emacs %{appDefaultsFile}
/usr/share/applications/emacs.desktop /usr/share/applications/emacs.desktop
/usr/share/pixmaps/emacs.png /usr/share/pixmaps/emacs.png
@ -3174,6 +3187,8 @@ done
/usr/share/emacs/%{version}/lisp/xt-mouse.el.gz /usr/share/emacs/%{version}/lisp/xt-mouse.el.gz
%changelog %changelog
* Mon Jun 18 2007 - werner@suse.de
- Use the app-default file macro, avoid empty MALLOC_CHECK_
* Mon Jun 04 2007 - werner@suse.de * Mon Jun 04 2007 - werner@suse.de
- Update ot final emacs version 22.1 - Update ot final emacs version 22.1
* Mon Jun 04 2007 - werner@suse.de * Mon Jun 04 2007 - werner@suse.de