Hello community, here is the log from the commit of package rxvt-unicode checked in at Mon Aug 14 17:43:05 CEST 2006. -------- --- rxvt-unicode/rxvt-unicode.changes 2006-08-11 21:10:43.000000000 +0200 +++ rxvt-unicode/rxvt-unicode.changes 2006-08-14 13:29:21.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 14 13:28:01 CEST 2006 - mfabian@suse.de + +- fix configure.ac test for working Xlocale (makes XIM work again). + +------------------------------------------------------------------- New: ---- fix-x-locale-detection-x11r7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rxvt-unicode.spec ++++++ --- /var/tmp/diff_new_pack.9OTolX/_old 2006-08-14 17:43:00.000000000 +0200 +++ /var/tmp/diff_new_pack.9OTolX/_new 2006-08-14 17:43:00.000000000 +0200 @@ -19,7 +19,7 @@ %endif # Version: 7.9 -Release: 2 +Release: 3 # License: LGPL Group: System/X11/Terminals @@ -34,6 +34,7 @@ Patch4: rxvt-unicode-7.7_missing_sentinel.patch Patch5: rxvt-unicode-ptytty.patch Patch6: rxvt-unicode-7.7_utmp_including.patch +Patch7: fix-x-locale-detection-x11r7.patch # Summary: Rxvt X Terminal with Unicode Support @@ -55,6 +56,7 @@ %patch4 %patch5 %patch6 +%patch7 -p1 find -type d -name CVS -print0 | xargs -r0 rm -r %build @@ -64,8 +66,12 @@ %if %{suse_version} >= 1010 %if "%(xft-config --prefix)" == "/usr" %define _prefix %{_usr} +%define xincludes /usr/include +%define xlibraries /usr/%{_lib} %else %define _prefix %{_usr}/X11R6 +%define xincludes /usr/X11R6/include +%define xlibraries /usr/X11R6/%{_lib} %endif %define _mandir %{_usr}/share/man/ %endif @@ -112,6 +118,8 @@ --enable-pointer-blank \ --enable-8bitctrls \ --enable-frills \ + --x-includes=%{xincludes} \ + --x-libraries=%{xlibraries} \ %if %{?suse_version} >= 1010 --with-xpm-includes=%{_prefix}/include \ --with-xpm-library=%{_prefix}/%{_lib} \ @@ -166,6 +174,8 @@ %{_libdir}/urxvt/perl/kuake %changelog -n rxvt-unicode +* Mon Aug 14 2006 - mfabian@suse.de +- fix configure.ac test for working Xlocale (makes XIM work again). * Fri Aug 11 2006 - mfabian@suse.de - move stuff from /usr/X11R6/ to /usr/ (because of X11R7). * Mon Aug 07 2006 - mrueckert@suse.de ++++++ fix-x-locale-detection-x11r7.patch ++++++ diff -ru rxvt-unicode-7.9.orig/configure.ac rxvt-unicode-7.9/configure.ac --- rxvt-unicode-7.9.orig/configure.ac 2006-02-08 23:43:41.000000000 +0100 +++ rxvt-unicode-7.9/configure.ac 2006-08-14 13:03:00.000000000 +0200 @@ -689,9 +689,9 @@ main() { char *p; if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) -exit (XSupportsLocale() ? 0 : 1); +return (XSupportsLocale() ? 0 : 1); else -exit (1);}]])],[dnl +return (1);}]])],[dnl rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) if test x$rxvt_cv_func_xlocale = xyes; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org