Hello community, here is the log from the commit of package NX checked in at Sat Aug 12 18:55:38 CEST 2006. -------- --- NX/NX.changes 2006-07-31 21:50:12.000000000 +0200 +++ NX/NX.changes 2006-08-11 23:13:58.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 11 23:13:33 CEST 2006 - sndirsch@suse.de + +- xorg7.diff: adjusted paths to X.Org 7 + +------------------------------------------------------------------- New: ---- xorg7.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NX.spec ++++++ --- /var/tmp/diff_new_pack.BWMpso/_old 2006-08-12 18:55:08.000000000 +0200 +++ /var/tmp/diff_new_pack.BWMpso/_new 2006-08-12 18:55:08.000000000 +0200 @@ -20,7 +20,7 @@ URL: http://www.nomachine.com/sources.php Group: System/X11/Servers/XF86_4 Version: 1.5.0 -Release: 43 +Release: 44 Summary: Proxy System for X11 #Compression Libraries and Proxy Sources Source: nxproxy-%{version}-9.tar.gz @@ -46,6 +46,7 @@ Patch6: gcc4-friends.patch Patch7: ppc-no-signed-char.diff Patch8: xorg-CAN-2005-2495.patch +Patch9: xorg7.diff NoSource: 5 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,6 +81,7 @@ pushd nx-X11 %patch8 popd +%patch9 ln -s rdesktop.1 nxdesktop/doc/nxdesktop.1 cat >> nx-X11/config/cf/host.def << EOF #ifdef i386Architecture @@ -95,6 +97,8 @@ #define OptimizedCDebugFlags $RPM_OPT_FLAGS GccAliasingArgs #endif #define HasZlib YES +/* X.Org 7 changes */ +#define XLocaleDir /usr/share/X11/locale EOF %build @@ -215,6 +219,8 @@ /usr/share/NX/keymaps-windows/ %changelog -n NX +* Fri Aug 11 2006 - sndirsch@suse.de +- xorg7.diff: adjusted paths to X.Org 7 * Mon Jul 31 2006 - sndirsch@suse.de - fixed build * Sun Jul 23 2006 - sndirsch@suse.de ++++++ xorg7.diff ++++++ diff -u -r nx-X11/programs/Xserver/hw/nxagent.orig/Font.c nx-X11/programs/Xserver/hw/nxagent/Font.c --- nx-X11/programs/Xserver/hw/nxagent.orig/Font.c 2005-12-12 17:51:51.000000000 +0100 +++ nx-X11/programs/Xserver/hw/nxagent/Font.c 2006-08-11 22:57:24.000000000 +0200 @@ -61,7 +61,7 @@ #undef DEBUG #define NXAGENT_DEFAULT_FONT_DIR "/usr/X11R6/lib/X11/fonts" -#define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/X11/fonts" +#define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/fonts" #define NXAGENT_DEFAULT_FONT_PATH \ "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\ @@ -69,9 +69,9 @@ /usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/" #define NXAGENT_ALTERNATE_FONT_PATH \ -"/usr/share/X11/fonts/misc/,/usr/share/X11/fonts/Speedo/,\ -/usr/share/X11/fonts/Type1/,/usr/share/X11/fonts/75dpi/,\ -/usr/share/X11/fonts/100dpi/,/usr/share/X11/fonts/TTF/" +"/usr/share/fonts/misc/,/usr/share/fonts/Speedo/,\ +/usr/share/fonts/Type1/,/usr/share/fonts/75dpi/,\ +/usr/share/fonts/100dpi/,/usr/share/fonts/TTF/" #undef NXAGENT_FONTCACHE_DEBUG #undef NXAGENT_RECONNECT_FONT_DEBUG @@ -1021,7 +1021,7 @@ else if (stat(NXAGENT_ALTERNATE_FONT_DIR, &dirStat) == 0) { /* - * Let's use the new "/usr/share/X11/fonts" path. + * Let's use the new "/usr/share/fonts" path. */ #ifdef TEST diff -u -r nx-X11/programs/Xserver/hw/nxagent.orig/Keyboard.c nx-X11/programs/Xserver/hw/nxagent/Keyboard.c --- nx-X11/programs/Xserver/hw/nxagent.orig/Keyboard.c 2005-11-21 13:12:39.000000000 +0100 +++ nx-X11/programs/Xserver/hw/nxagent/Keyboard.c 2006-08-11 22:57:24.000000000 +0200 @@ -110,7 +110,7 @@ ); #ifndef XKB_BASE_DIRECTORY -#define XKB_BASE_DIRECTORY "/usr/X11R6/lib/X11/xkb/" +#define XKB_BASE_DIRECTORY "/usr/share/X11/xkb/" #endif #ifndef XKB_CONFIG_FILE #define XKB_CONFIG_FILE "X0-config.keyboard" diff -u -r nx-X11/lib/X11.orig/Imakefile nx-X11/lib/X11/Imakefile --- nx-X11/lib/X11.orig/Imakefile 2006-08-11 23:02:44.000000000 +0200 +++ nx-X11/lib/X11/Imakefile 2006-08-11 23:06:22.000000000 +0200 @@ -144,8 +144,8 @@ XF86BIGFONT_DEFINES = XF86BigfontExtensionDefines - EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/XErrorDB\" - KDB_DEFINES = -DKEYSYMDB=\"$(LIBDIR)/XKeysymDB\" + EDB_DEFINES = -DERRORDB=\"/usr/share/X11/XErrorDB\" + KDB_DEFINES = -DKEYSYMDB=\"/usr/share/X11//XKeysymDB\" CMS_DEFINES = -DXCMSDB=\"$(LIBDIR)/Xcms.txt\" #if HasSnprintf MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...