Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at 2011-12-25 17:42:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xemacs (Old) and /work/SRC/openSUSE:Factory/.xemacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xemacs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xemacs/xemacs.changes 2011-09-23 12:51:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xemacs.new/xemacs.changes 2011-12-25 17:43:00.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Dec 21 13:45:26 UTC 2011 - [email protected] + +- add autoconf as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Wed Dec 21 10:31:54 UTC 2011 - [email protected] + +- remove call to suse_update_config (very old work around) + +------------------------------------------------------------------- +Tue Nov 22 14:24:50 UTC 2011 - [email protected] + +- Add patch to use libtinfo if available + +------------------------------------------------------------------- New: ---- xemacs-tinfo.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.cWc5E0/_old 2011-12-25 17:43:01.000000000 +0100 +++ /var/tmp/diff_new_pack.cWc5E0/_new 2011-12-25 17:43:01.000000000 +0100 @@ -16,10 +16,25 @@ # - Name: xemacs -BuildRequires: canna-devel compface db-devel fwnndev gcc-c++ gdbm-devel krb5 libpng-devel libtiff-devel ncurses-devel openldap2-devel texinfo update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel +BuildRequires: autoconf +BuildRequires: canna-devel +BuildRequires: compface +BuildRequires: db-devel BuildRequires: fdupes +BuildRequires: fwnndev +BuildRequires: gcc-c++ +BuildRequires: gdbm-devel +BuildRequires: krb5 +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: ncurses-devel +BuildRequires: openldap2-devel +BuildRequires: texinfo +BuildRequires: update-desktop-files +BuildRequires: xaw3d-devel +BuildRequires: xorg-x11 +BuildRequires: xorg-x11-devel %if 0%{?suse_version} > 1130 BuildRequires: gpm-devel %else @@ -33,15 +48,14 @@ %define _id b604d235f028 %define _hg beta-%{_id} Url: http://www.xemacs.org -License: GPLv2+ -Group: Productivity/Editors/Emacs PreReq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv -AutoReqProv: on Version: 21.5.29.b604d235f028 -Release: 12 +Release: 0 Summary: XEmacs +License: GPL-2.0+ +Group: Productivity/Editors/Emacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the Mercurial tree of XEmacs: # See: http://xemacs.digimirror.nl/Develop/hgaccess.html @@ -75,6 +89,7 @@ Patch33: set-locale-to-c-when-not-supported-by-x.patch Patch34: suppress-warning-about-undefined-unicode-key-mappings.patch Patch38: unitialized-variables.patch +Patch39: xemacs-tinfo.dif Patch41: bugzilla-294746-set-language-unicode-precedence-list-at-startup.patch Patch42: build-fix-ccl-load-problem.patch Patch43: set-language-unicode-precedence-list.patch @@ -99,12 +114,9 @@ macros. %package -n xemacs-el -License: GPLv2+ Requires: xemacs == %{version}-%{release} Requires: xemacs-packages-el Summary: Emacs-Lisp source files for XEmacs -Group: Productivity/Editors/Emacs -AutoReqProv: on %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -117,11 +129,8 @@ at the Lisp sources. %package -n xemacs-info -License: GPLv2+ Requires: xemacs-packages-info Summary: Info Files for XEmacs -Group: Productivity/Editors/Emacs -AutoReqProv: on %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -164,6 +173,7 @@ %patch33 -p1 #%patch34 -p1 %patch38 -p1 +%patch39 -p0 #%patch40 -p1 #%patch41 -p1 #%patch42 -p1 @@ -188,7 +198,6 @@ find . | xargs touch -r . %build -%{?suse_update_config:%{suse_update_config -f}} #libtoolize --force #autoreconf --force --install --verbose #rm configure ++++++ xemacs-tinfo.dif ++++++ --- configure.ac +++ configure.ac 2011-11-22 14:21:37.303146192 +0000 @@ -4946,15 +4946,30 @@ if test "$with_tty" = "yes" ; then AC_DEFINE(HAVE_TTY) dnl Autodetect ncurses. + cf_tgetent="" if test -z "$with_ncurses"; then - AC_CHECK_LIB(ncurses, tgetent, with_ncurses=yes, with_ncurses=no) + with_ncurses=no; + for lib in tinfo ncurses ncursesw ; do + AC_CHECK_LIB($lib, tgetent, [with_ncurses=yes; cf_tgetent="$lib"; break]) + done fi if test "$with_ncurses" = "yes"; then + if test x$cf_tgetent = x ; then + for lib in tinfo ncurses ncursesw ; do + AC_CHECK_LIB($lib, tgetent, [cf_tgetent="$lib"; break]) + done + fi AC_DEFINE(HAVE_NCURSES) - AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) - AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h) + if test "$cf_tgetent" = ncursesw; then + AC_DEFINE(HAVE_NCURSESW) + AC_CHECK_HEADER(ncursesw/curses.h, curses_h_file=ncursesw/curses.h) + AC_CHECK_HEADER(ncursesw/term.h, term_h_file=ncursesw/term.h) + else + AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h) + AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h) + fi XE_ADD_OBJS(terminfo.o) - XE_PREPEND(-lncurses, LIBS) + XE_PREPEND(-l$cf_tgetent, LIBS) if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then dnl Try again, and check for the bogus ncurses/ include bug. --- src/config.h.in +++ src/config.h.in 2011-11-22 14:21:50.939646812 +0000 @@ -580,6 +580,7 @@ things are arranged in config.h.in. In /* Compile in support for ncurses? */ #undef HAVE_NCURSES +#undef HAVE_NCURSESW /* Full #include file paths for ncurses' curses.h and term.h. */ #undef CURSES_H_FILE #undef TERM_H_FILE -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
