Hello community, here is the log from the commit of package xorg-x11-server checked in at Tue Aug 8 00:44:20 CEST 2006. -------- --- xorg-x11-server/xorg-x11-server.changes 2006-08-07 16:43:00.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2006-08-07 19:26:46.000000000 +0200 @@ -1,0 +2,16 @@ +Mon Aug 7 19:26:36 CEST 2006 - sndirsch@suse.de + +- added "Requires: xorg-x11-fonts" to prevent issues like + "could not open default font 'fixed'" for any Xserver + +------------------------------------------------------------------- +Mon Aug 7 17:42:43 CEST 2006 - sndirsch@suse.de + +- make sure that symlinks + /usr/bin/X --> /var/X11R6/bin/X + /var/X11R6/bin/X --> /usr/bin/Xorg + are packaged. +- p_xorg_acpi.diff: + * fixed for archs which don't have HAVE_ACPI defined, e.g. ppc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.XfRIsf/_old 2006-08-08 00:43:40.000000000 +0200 +++ /var/tmp/diff_new_pack.XfRIsf/_new 2006-08-08 00:43:40.000000000 +0200 @@ -17,10 +17,11 @@ URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.1 -Release: 14 +Release: 15 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 +Requires: xorg-x11-fonts Provides: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx Obsoletes: xorg-x11-Xnest xorg-x11-Xprt xorg-x11-Xvfb xorg-x11-server-glx Summary: X.Org Server @@ -231,6 +232,8 @@ ln -snf ../../bin/Xorg $RPM_BUILD_ROOT/usr/X11R6/bin/Xorg chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg mkdir -p $RPM_BUILD_ROOT/var/X11R6/bin +ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/X11R6/bin/X +ln -snf ../../var/X11R6/bin/X $RPM_BUILD_ROOT/usr/bin/X mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions} install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates mkdir -p $RPM_BUILD_ROOT/etc/permissions.d @@ -397,6 +400,7 @@ %{_mandir}/man1/* %{_mandir}/man4/* %{_mandir}/man5/* +/var/X11R6/bin/X /var/lib/xkb/compiled/README.compiled %files sdk @@ -410,6 +414,16 @@ %changelog -n xorg-x11-server * Mon Aug 07 2006 - sndirsch@suse.de +- added "Requires: xorg-x11-fonts" to prevent issues like + "could not open default font 'fixed'" for any Xserver +* Mon Aug 07 2006 - sndirsch@suse.de +- make sure that symlinks + /usr/bin/X --> /var/X11R6/bin/X + /var/X11R6/bin/X --> /usr/bin/Xorg + are packaged. +- p_xorg_acpi.diff: + * fixed for archs which don't have HAVE_ACPI defined, e.g. ppc +* Mon Aug 07 2006 - sndirsch@suse.de - p_xf86Mode.diff: * removes wrong warning (Bug #139510) - p_xorg_acpi.diff: ++++++ p_xorg_acpi.diff ++++++ --- /var/tmp/diff_new_pack.XfRIsf/_old 2006-08-08 00:43:40.000000000 +0200 +++ /var/tmp/diff_new_pack.XfRIsf/_new 2006-08-08 00:43:40.000000000 +0200 @@ -1,6 +1,6 @@ diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_acpi.c hw/xfree86/os-support/linux/lnx_acpi.c ---- hw/xfree86/os-support/linux.orig/lnx_acpi.c 2006-08-07 11:42:39.000000000 +0200 -+++ hw/xfree86/os-support/linux/lnx_acpi.c 2006-08-07 12:11:48.000000000 +0200 +--- hw/xfree86/os-support/linux.orig/lnx_acpi.c 2006-08-07 17:57:13.000000000 +0200 ++++ hw/xfree86/os-support/linux/lnx_acpi.c 2006-08-07 17:57:20.000000000 +0200 @@ -32,8 +32,10 @@ #define ACPI_VIDEO_HEAD_INVALID (~0u - 1) #define ACPI_VIDEO_HEAD_END (~0u) @@ -95,8 +95,8 @@ } } diff -p -u -r hw/xfree86/os-support/linux.orig/lnx_apm.c hw/xfree86/os-support/linux/lnx_apm.c ---- hw/xfree86/os-support/linux.orig/lnx_apm.c 2006-08-07 11:42:39.000000000 +0200 -+++ hw/xfree86/os-support/linux/lnx_apm.c 2006-08-07 12:05:05.000000000 +0200 +--- hw/xfree86/os-support/linux.orig/lnx_apm.c 2006-08-07 17:57:13.000000000 +0200 ++++ hw/xfree86/os-support/linux/lnx_apm.c 2006-08-07 17:58:08.000000000 +0200 @@ -12,6 +12,7 @@ #ifdef HAVE_ACPI @@ -105,15 +105,17 @@ #endif #ifdef HAVE_APM -@@ -150,6 +151,12 @@ xf86OSPMOpen(void) +@@ -150,6 +151,14 @@ xf86OSPMOpen(void) ret = lnxAPMOpen(); #endif ++#ifdef HAVE_ACPI + /* if we can neither open ACPI nor APM poll for an ACPI service to + become available */ + + if (!ret && !xf86acpiDisableFlag) + ret = lnxACPIPoll(); ++#endif + return ret; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...