rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

Accepting request 35054 from editors

Browse Source 
checked in (request 35054)

OBS-URL: https://build.opensuse.org/request/show/35054
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=23
This commit is contained in:
OBS User autobuild 2010-03-18 23:16:48 +00:00 committed by Git OBS Bridge
parent c1799c8809
commit 583ea481a0
2 changed files with 26 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emacs.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Wed Mar 17 14:25:12 CET 2010 - werner@suse.de
- gcc45 seems not to work with emacs switch to gcc43 (bnc#587307)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 24 18:13:47 UTC 2010 - coolo@novell.com Wed Feb 24 18:13:47 UTC 2010 - coolo@novell.com

29
emacs.spec
View File

@ -20,7 +20,6 @@
Name: emacs Name: emacs
BuildRequires: alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel giflib-devel gpm gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel BuildRequires: alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel giflib-devel gpm gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel
BuildRequires: gcc43
Url: http://www.gnu.org/software/emacs/ Url: http://www.gnu.org/software/emacs/
License: GPLv2+ License: GPLv2+
Group: Productivity/Editors/Emacs Group: Productivity/Editors/Emacs
@ -253,35 +252,21 @@ fi
%patch -P 18 -p1 %patch -P 18 -p1
%build %build
CC=gcc-4.3
cflags () cflags ()
{ {
local flag=$1; shift local flag=$1; shift
local var=$1; shift case "${RPM_OPT_FLAGS}" in
test -n "${flag}" -a -n "${var}" || return
case "${!var}" in
*${flag}*) return *${flag}*) return
esac esac
case "$flag" in if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
-Wl,*) local var=$1; shift
set -o noclobber
echo 'int main () { return 0; }' > ldtest.c
if ${CC:-gcc} -Werror $flag -o /dev/null -xc ldtest.c > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag eval $var=\${$var:+\$$var\ }$flag
fi fi
set +o noclobber if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
rm -f ldtest.c local var=$1; shift
;;
*)
if ${CC:-gcc} -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag eval $var=\${$var:+\$$var\ }$flag
fi fi
if ${CXX:-g++} -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag
fi
esac
} }
if test "elisp$(sed -rn '/^INFO_TARGET/{s@.*=\s*@@; :j; s@(\.\./info|\$[\(\{]infodir[\)\}])/@@g; /\\$/{N; s@\\\n\s*@@; b j;}; H;};${g;s/[[:space:]]+/ /g;p;}' doc/*/Makefile.in)" != "%info_files" if test "elisp$(sed -rn '/^INFO_TARGET/{s@.*=\s*@@; :j; s@(\.\./info|\$[\(\{]infodir[\)\}])/@@g; /\\$/{N; s@\\\n\s*@@; b j;}; H;};${g;s/[[:space:]]+/ /g;p;}' doc/*/Makefile.in)" != "%info_files"
then then
echo Please update info_files >&2 echo Please update info_files >&2
@ -314,7 +299,9 @@ LDFLAGS=
LARGE="-DSYSTEM_PURESIZE_EXTRA=55000 \ LARGE="-DSYSTEM_PURESIZE_EXTRA=55000 \
-DSITELOAD_PURESIZE_EXTRA=10000 \ -DSITELOAD_PURESIZE_EXTRA=10000 \
" "
LANG=POSIX; LC_CTYPE=ISO-8859-1 CC=gcc
LANG=POSIX
LC_CTYPE=ISO-8859-1
export CC CFLAGS LANG LC_CTYPE LDFLAGS export CC CFLAGS LANG LC_CTYPE LDFLAGS
PREFIX="--prefix=%{_prefix} \ PREFIX="--prefix=%{_prefix} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \