Hello community, here is the log from the commit of package xkeycaps checked in at Fri Oct 5 00:40:26 CEST 2007. -------- --- xkeycaps/xkeycaps.changes 2007-06-13 12:48:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/xkeycaps/xkeycaps.changes 2007-10-04 21:57:10.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 4 21:56:03 CEST 2007 - bg@suse.de + +- remove definitions and tests only useful for hpux and make it + build for hppa linux + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeycaps.spec ++++++ --- /var/tmp/diff_new_pack.k22890/_old 2007-10-05 00:40:09.000000000 +0200 +++ /var/tmp/diff_new_pack.k22890/_new 2007-10-05 00:40:09.000000000 +0200 @@ -12,13 +12,13 @@ Name: xkeycaps BuildRequires: xorg-x11 xorg-x11-devel -License: BSD License and BSD-like, X11/MIT +License: BSD 3-Clause; X11/MIT Group: System/X11/Utilities -Autoreqprov: on +AutoReqProv: on Version: 2.46 -Release: 812 +Release: 843 Summary: A graphical frontend for "xmodmap" -URL: http://www.jwz.org/xkeycaps/ +Url: http://www.jwz.org/xkeycaps/ Source: xkeycaps-%{version}.tar.bz2 Patch0: xkeycaps-%{version}.patch Patch1: xkeycaps-%{version}-Xmodmap.patch @@ -92,8 +92,10 @@ %doc README defining.txt hierarchy.txt sgi-microsoft.txt %doc %{_xorg7_mandir}/man1/xkeycaps.1x.gz /usr/%{_xorg7bin}/xkeycaps - %changelog +* Thu Oct 04 2007 - bg@suse.de +- remove definitions and tests only useful for hpux and make it + build for hppa linux * Wed Jun 13 2007 - pgajdos@suse.cz - context menu is working now [#282654] - context-menu.patch ++++++ xkeycaps-2.46-Imake.patch ++++++ --- /var/tmp/diff_new_pack.k22890/_old 2007-10-05 00:40:09.000000000 +0200 +++ /var/tmp/diff_new_pack.k22890/_new 2007-10-05 00:40:09.000000000 +0200 @@ -1,5 +1,5 @@ ---- Imakefile -+++ Imakefile +--- Imakefile.orig 2007-10-04 19:50:50.000000000 +0000 ++++ Imakefile 2007-10-04 19:52:59.000000000 +0000 @@ -1,6 +1,6 @@ -/**/# Imakefile for xkeycaps; -/**/# Copyright (c) 1991, 1992, 1993, 1994, 1995, 1999 Jamie Zawinski. @@ -10,7 +10,35 @@ /* * To specify a different default keyboard (for when the vendor display * string isn't recognised) do something like this: -@@ -353,8 +353,8 @@ +@@ -37,27 +37,6 @@ + SYSDEP_OBJS = $(CURRENT_DIR)/sunOS.o + #endif + +-#ifdef HPArchitecture +- SYSDEP_OBJS = $(CURRENT_DIR)/hpux.o +- +- /* This nonsense seems to be necessary to get the passwd struct on all HP +- * systems. HP can't seem to make up their mind what preprocessor directive +- * they want to use to tell their header files that they are being compiled +- * on an HP. Don't ask me to explain why these aren't the default... +- * On some systems, -Ae defines all of these, but I don't believe that is +- * (has been?) the case on all systems. +- * +- * Also, apparently "HPkeysyms.h" comes with HP's R5, but not MIT's R6, so +- * we need to add the HP R5 directory to the end of the include path as +- * well. +- */ +- HP_LOSSAGE = -D_HPUX_SOURCE -DHPUX -Dhpux -D__hpux -Dunix $(HP_LOSSAGE_2)\ +- -I/usr/contrib/X11R6/include -I/usr/include/X11R5 +-# if !HasGcc2 +- HP_LOSSAGE_2 = -Aa -Ae +-# endif +-#endif +- + #ifdef SGIArchitecture + # ifndef HasGcc + /* This will cause the keyboard template data to go into a read-only +@@ -353,8 +332,8 @@ TAR = tar COMPRESS = compress COMPRESS_EXT = Z ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org