[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]
rpms/xorg-x11/FC-4 xdm.pamd, 1.1, 1.2 xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch, 1.3, 1.4 xorg-x11.spec, 1.201, 1.202 xorg-x11-6.8.0-redhat-custom-startup.patch, 1.2, NONE
- From: fedora-cvs-commits redhat com
- To: fedora-cvs-commits redhat com
- Subject: rpms/xorg-x11/FC-4 xdm.pamd, 1.1, 1.2 xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch, 1.3, 1.4 xorg-x11.spec, 1.201, 1.202 xorg-x11-6.8.0-redhat-custom-startup.patch, 1.2, NONE
- Date: Wed, 31 Aug 2005 18:59:39 -0400
Author: mharris
Update of /cvs/dist/rpms/xorg-x11/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv2954
Modified Files:
xdm.pamd
xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
xorg-x11.spec
Removed Files:
xorg-x11-6.8.0-redhat-custom-startup.patch
Log Message:
Update: Merge FC5 development into FC4 branch for pending FC4 update.
Index: xdm.pamd
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xdm.pamd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xdm.pamd 9 Sep 2004 14:54:31 -0000 1.1
+++ xdm.pamd 31 Aug 2005 22:59:37 -0000 1.2
@@ -4,4 +4,5 @@
account required pam_stack.so service=system-auth
password required pam_stack.so service=system-auth
session required pam_stack.so service=system-auth
-session optional pam_console.so
+session required pam_loginuid.so
+session optional pam_console.so
xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch:
helper_exec.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 89 insertions(+), 15 deletions(-)
Index: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch 6 May 2005 01:53:42 -0000 1.3
+++ xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch 31 Aug 2005 22:59:37 -0000 1.4
@@ -2,6 +2,9 @@
which changes the X server to use Linux native /proc based PCI
interfaces by default instead of bitbanging PCI config space directly.
+Patch updated by Olivier Baudron <olivier baudron m4x org> to fix all
+occurrences of PCI config space access.
+
This fixes a problem in Linux where other software may be probing PCI
config space using the native interfaces correctly and the kernel PCI
lock is held, then the X server starts up and simultaneously stomps on
@@ -24,9 +27,9 @@
https://bugs.freedesktop.org/show_bug.cgi?id=2880
---- xc/programs/Xserver/hw/xfree86/int10/helper_exec.c.ORIG 2002-11-25 16:05:49.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/int10/helper_exec.c 2005-03-31 14:38:01.000000000 -0500
-@@ -23,10 +23,8 @@
+--- xc/programs/Xserver/hw/xfree86/int10/helper_exec.c.use-linux-native-pciscan-by-default 2004-04-23 15:54:06.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/int10/helper_exec.c 2005-07-27 16:41:26.000000000 -0400
+@@ -23,10 +23,12 @@
#include "int10Defines.h"
#include "xf86int10.h"
@@ -34,10 +37,54 @@
static int pciCfg1in(CARD16 addr, CARD32 *val);
static int pciCfg1out(CARD16 addr, CARD32 val);
-#endif
++static int pciCfg1inw(CARD16 addr, CARD16 *val);
++static int pciCfg1outw(CARD16 addr, CARD16 val);
++static int pciCfg1inb(CARD16 addr, CARD8 *val);
++static int pciCfg1outb(CARD16 addr, CARD8 val);
#if defined (_PC)
static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set);
#endif
-@@ -396,10 +394,8 @@
+@@ -321,7 +323,8 @@
+ }
+ #endif /* __NOT_YET__ */
+ } else {
+- val = inb(Int10Current->ioBase + port);
++ if (!pciCfg1inb(port, &val))
++ val = inb(Int10Current->ioBase + port);
+ #ifdef PRINT_PORT
+ ErrorF(" inb(%#x) = %2.2x\n", port, val);
+ #endif
+@@ -343,7 +346,8 @@
+ (void)getsecs(&sec, &usec);
+ val = (CARD16)(usec / 3);
+ } else {
+- val = inw(Int10Current->ioBase + port);
++ if (!pciCfg1inw(port, &val))
++ val = inw(Int10Current->ioBase + port);
+ }
+ #ifdef PRINT_PORT
+ ErrorF(" inw(%#x) = %4.4x\n", port, val);
+@@ -380,7 +384,8 @@
+ #ifdef PRINT_PORT
+ ErrorF(" outb(%#x, %2.2x)\n", port, val);
+ #endif
+- outb(Int10Current->ioBase + port, val);
++ if (!pciCfg1outb(port, val))
++ outb(Int10Current->ioBase + port, val);
+ }
+ }
+
+@@ -391,7 +396,8 @@
+ ErrorF(" outw(%#x, %4.4x)\n", port, val);
+ #endif
+
+- outw(Int10Current->ioBase + port, val);
++ if (!pciCfg1outw(port, val))
++ outw(Int10Current->ioBase + port, val);
+ }
+
+ CARD32
+@@ -399,10 +405,8 @@
{
CARD32 val;
@@ -49,7 +96,7 @@
#ifdef PRINT_PORT
ErrorF(" inl(%#x) = %8.8x\n", port, val);
-@@ -414,10 +410,8 @@
+@@ -417,10 +421,8 @@
ErrorF(" outl(%#x, %8.8x)\n", port, val);
#endif
@@ -61,7 +108,7 @@
}
CARD8
-@@ -456,7 +450,6 @@
+@@ -459,7 +461,6 @@
(*Int10Current->mem->wl)(Int10Current, addr, val);
}
@@ -69,7 +116,87 @@
static CARD32 PciCfg1Addr = 0;
#define TAG(Cfg1Addr) (Cfg1Addr & 0xffff00)
-@@ -489,7 +482,6 @@
+@@ -487,12 +488,85 @@
+ return 1;
+ }
+ if (addr == 0xCFC) {
+- pciWriteLong(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr),val);
++ pciWriteLong(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr), val);
++ return 1;
++ }
++ return 0;
++}
++
++static int
++pciCfg1inw(CARD16 addr, CARD16 *val)
++{
++ int offset, shift;
++
++ if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
++ shift = (addr - 0xCF8) * 8;
++ *val = (PciCfg1Addr >> shift) & 0xffff;
++ return 1;
++ }
++ if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
++ offset = addr - 0xCFC;
++ *val = pciReadWord(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr) + offset);
++ return 1;
++ }
++ return 0;
++}
++
++static int
++pciCfg1outw(CARD16 addr, CARD16 val)
++{
++ int offset, shift;
++
++ if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
++ shift = (addr - 0xCF8) * 8;
++ PciCfg1Addr &= ~(0xffff << shift);
++ PciCfg1Addr |= ((CARD32) val) << shift;
++ return 1;
++ }
++ if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
++ offset = addr - 0xCFC;
++ pciWriteWord(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr) + offset, val);
++ return 1;
++ }
++ return 0;
++}
++
++static int
++pciCfg1inb(CARD16 addr, CARD8 *val)
++{
++ int offset, shift;
++
++ if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
++ shift = (addr - 0xCF8) * 8;
++ *val = (PciCfg1Addr >> shift) & 0xff;
++ return 1;
++ }
++ if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
++ offset = addr - 0xCFC;
++ *val = pciReadByte(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr) + offset);
++ return 1;
++ }
++ return 0;
++}
++
++static int
++pciCfg1outb(CARD16 addr, CARD8 val)
++{
++ int offset, shift;
++
++ if ((addr >= 0xCF8) && (addr <= 0xCFB)) {
++ shift = (addr - 0xCF8) * 8;
++ PciCfg1Addr &= ~(0xff << shift);
++ PciCfg1Addr |= ((CARD32) val) << shift;
++ return 1;
++ }
++ if ((addr >= 0xCFC) && (addr <= 0xCFF)) {
++ offset = addr - 0xCFC;
++ pciWriteByte(TAG(PciCfg1Addr), OFFSET(PciCfg1Addr) + offset, val);
+ return 1;
}
return 0;
}
Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- xorg-x11.spec 26 May 2005 21:02:55 -0000 1.201
+++ xorg-x11.spec 31 Aug 2005 22:59:37 -0000 1.202
@@ -11,15 +11,16 @@
# xorg-x11 build requires about 1Gb of disk space, however other disk space
# users may be running simultaneously, so we set requirements to 4Gb. This
# value is increased by 1Gb each time a build fails due to out of disk space.
-BuildConflicts: rhbuildsys(DiskFree) < 4000M
+BuildConflicts: rhbuildsys(DiskFree) < 6000M
%define cvs_build 0
%define cvs_date 0000_00_00
Name: xorg-x11
Version: 6.8.2
-Release: 35
-#Release: 1.FC3.35
+#Release: 45
+#Release: 1.FC3.45
+Release: 37.FC4.45
%define build_mharris_mode 0
@@ -105,12 +106,6 @@
%define Glide3Require 0
%endif
-# Now that rpm mostly handles multilib so to speak, give or take, sortof, we
-# don't need to package the libs data stuff in a separate subpackage anymore.
-%define with_libs_data 0
-
-%define with_new_savage_driver 0
-
# s390 doesn't have video hardware. xorg-x11 support for PPC64 is very very
# new and experimental. We ship libs only as PPC64 has we ship the PPC 32bit
# X server. When PPC64 is supported much better in xorg-x11, and we actually
@@ -342,7 +337,11 @@
%endif
Source1: host.def
-Source3: xserver.pamd
+Source2: xserver.pamd
+# This file is for FC3/FC4 builds, where the new audit system is not included
+# in our pam implementation yet.
+Source3: xdm-pre-audit-system.pamd
+# This file is for RHEL4/FC5 builds, which include the new audit system
Source4: xdm.pamd
Source5: xfs.init
Source6: xfs.config
@@ -350,7 +349,6 @@
%if %{with_archexec}
Source10: archexec
%endif
-#Source14: http://www.probo.com/timr/savage-1.1.27t.tgz
Source23: mkxauth
Source24: mkxauth.1x
Source25: CHANGELOG-rpm
@@ -375,6 +373,7 @@
Patch1213: XFree86-4.3.0-radeon-ia64-preint10.patch
Patch1214: XFree86-4.3.0-radeon-disable-VideoRAM-option.patch
Patch1215: xorg-x11-6.8.1-ati-radeon-disable-dri.patch
+Patch1216: xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch
# Patches 1300-1319: chips driver patches
Patch1300: XFree86-4.2.99.901-chips-default-to-noaccel-on-69000.patch
@@ -391,6 +390,10 @@
# Patches 1625-1649: mga driver patches
# Patches 1650-1674: neomagic driver patches
# Patches 1675-1699: nv driver patches
+Patch1675: xorg-x11-6.8.2-nv-driver-CVSHEAD-6.8.99.13.patch
+# TEMPORARY workaround for bug in nv driver (#157715), until there is a
+# real upstream fix.
+Patch1676: xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch
# Patches 1700-1719: rendition driver patches
# Patches 1720-1739: s3 driver patches
# Patches 1740-1759: s3virge driver patches
@@ -475,6 +478,8 @@
Patch9335: xorg-x11-6.8.1-ati-radeon-dynamic-clocks-fix-2.patch
Patch9336: xorg-x11-6.8.2-ati-ragexl-ia64-avoidcpiofix.patch
Patch9337: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
+Patch9338: xorg-x11-6.8.2-ia64-elfloader-cache-flush.patch
+Patch9339: xorg-x11-6.8.2-xkb-dutch-keyboard-layout-fixes.patch
# EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently).
# Once a patch is determined to be safe to apply to other releases, it can
@@ -498,8 +503,11 @@
Patch9702: xorg-x11-6.8.2-cursor-flicker.patch
Patch9705: xorg-x11-6.8.3-iso8859-compose-files-fdo2592-2156.patch
Patch9706: xorg-x11-6.8.3-lbxproxy-fdo2678-2051.patch
+
+# Disabled 9707, 9708 as they're included in the nv driver update patch #1675
Patch9707: xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch
Patch9708: xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch
+
Patch9709: xorg-x11-6.8.3-radeon-cursor-sync-fdo2844-2230.patch
Patch9710: xorg-x11-6.8.3-radeon-render-byteswap-fdo2164-1863.patch
Patch9711: xorg-x11-6.8.3-radeon-set-fb-location-fdo2698-2079.patch
@@ -511,13 +519,17 @@
Patch9718: xorg-x11-6.8.3-xset-fdo2258-2166.patch
Patch9719: xorg-x11-6.8.1-battle-libc-wrapper.patch
Patch9720: xorg-x11-6.8.2-gcc4-fix.patch
+Patch9721: xorg-x11-6.8.2-xnest-update-modifier-state-fdo3030-fdo3664.patch
+Patch9722: xorg-x11-6.8.2-xnest-fix-warning-spew-fdo3513.patch
+Patch9723: xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch
+
# END OF 6.8.3 CANDIDATES
# END OF DEVEL PATCHES
######################################################################
# Red Hat customizations, not intended for submission upstream
-Patch10000: xorg-x11-6.8.0-redhat-custom-startup.patch
+Patch10000: xorg-x11-6.8.2-redhat-kt.patch
Patch10001: XFree86-4.2.99.2-redhat-custom-modelines.patch
# Disable the ugly checkerboard pattern that X starts up with. We're in the
@@ -571,7 +583,7 @@
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
# Experimental Requires libGL{,U}. Once confirmed safe, we can deconditionalize
-%if %{build_fc4} || %{build_fc3}
+%if %{build_fc5} || %{build_fc4} || %{build_fc3}
Requires: libGL >= 1, libGLU >= 1
%endif
Obsoletes: xpm-devel, Mesa-devel
@@ -682,6 +694,16 @@
%package xdm
Summary: X Display Manager
Requires: %{name} = %{version}, /etc/pam.d/system-auth
+# pam requires were added for bug #159332 for new audit system. It really
+# should be a virtual provide in the pam package, to avoid odd version-release
+# games, but this is the way it was done so we have to live with it.
+%if %{build_rhel4}
+Requires: pam >= 0.77-66.8
+%endif
+%if %{build_fc5}
+Requires: pam >= 0.77-10
+%endif
+
# xinitrc requirement on 3.13 for user login shell enhancement to Xsession
Requires: xinitrc >= 3.13
Group: User Interface/X
@@ -709,15 +731,11 @@
%if ! %{build_mharris}
Conflicts: Xft
%endif
-%if %{with_libs_data}
-Requires: %{name}-libs-data = %{version}-%{release}
-%else
-Obsoletes: xorg-x11-libs-data < %{version}-%{release}
+Obsoletes: xorg-x11-libs-data
Obsoletes: XFree86-libs-data
# Files moved from these packages to XFree86-libs-data, and now to
# xorg-x11-libs-data, so we conflict them
Conflicts: XFree86 <= 4.2.99.2-0.20021105.0, XFree86-libs <= 4.2.99.2-0.20021105.0
-%endif
#Requires(post): /sbin/ldconfig grep textutils
#Requires(postun): /sbin/ldconfig grep textutils
#Requires(verify): /sbin/ldconfig grep textutils
@@ -740,20 +758,6 @@
to them. Software projects which use these libraries, should port their
code to current alternatives.
######################################################################
-%if %{with_libs_data}
-%package libs-data
-Summary: Architecture independent data required by X Window System libraries
-Group: System Environment/Libraries
-Obsoletes: XFree86-libs-data
-# Files moved from these packages to XFree86-libs-data, and now to
-# xorg-x11-libs-data, so we conflict them
-Conflicts: XFree86 <= 4.2.99.2-0.20021105.0, XFree86-libs <= 4.2.99.2-0.20021105.0
-
-%description libs-data
-Architecture independent data files required by the X11 runtime libraries,
-including locale and compose database files, XErrorsDB, rgb.txt, etc.
-%endif
-######################################################################
# Font subpackages
%if %{with_fonts}
%package base-fonts
@@ -980,7 +984,7 @@
# FIXME: These should be versioned to the Mesa version
Obsoletes: Mesa
Provides: Mesa
-%if %{build_fc4} || %{build_fc3}
+%if %{build_fc5} || %{build_fc4} || %{build_fc3}
Provides: libGL = 1
%endif
Obsoletes: XFree86-Mesa-libGL
@@ -1002,7 +1006,7 @@
Summary: Commonly used GL utility library
Group: System Environment/Libraries
Obsoletes: XFree86-Mesa-libGLU
-%if %{build_fc4} || %{build_fc3}
+%if %{build_fc5} || %{build_fc4} || %{build_fc3}
Provides: libGLU = 1
%endif
# Conflict is due to this package being split out from XFree86-libs a long time ago
@@ -1065,16 +1069,6 @@
# xc/config/cf/xfree86.cf.OBSOLETE-USE-xorg.cf-INSTEAD
#%patch0 -p0 -b .xf-4_3-branch
-%if %{with_new_savage_driver}
-{
- echo "Updating SAVAGE driver with %{SOURCE14}"
- pushd xc/programs/Xserver/hw/xfree86/drivers
- mv savage savage-4.3.0
- tar zxvf %{SOURCE14}
- popd
-}
-%endif
-
%if %{with_fastbuild}
%patch9 -p0 -b .makefile-fastbuild
%endif
@@ -1083,8 +1077,9 @@
%patch1214 -p0 -b .radeon-disable-VideoRAM-option
%if %{build_rhel4}
-%patch1215 -p0 -b .ati-radeon-disable-dri
+#%patch1215 -p0 -b .ati-radeon-disable-dri
%endif
+%patch1216 -p0 -b .ati-radeon-7000-disable-dri
# FIXME: Chips & technologies - Disable these two for now, to see if the
# problems are resolved that these two worked around.
@@ -1092,6 +1087,9 @@
#%patch1300 -p0 -b .chips-default-to-noaccel-on-69000
#%patch1301 -p0 -b .chips-default-to-swcursor-on-65550
+%patch1675 -p0 -b .nv-driver-CVSHEAD-6.8.99.13
+%patch1676 -p0 -b .redhat-nv-disable-s2scopy-on-geforce-6x00
+
######################################################################
%patch2022 -p1 -b .agpgart-load
@@ -1152,11 +1150,13 @@
%patch9335 -p0 -b .ati-radeon-dynamic-clocks-fix-2
%patch9336 -p0 -b .xorg-x11-6.8.2-ati-ragexl-ia64-avoidcpiofix.patch
%patch9337 -p0 -b .use-linux-native-pciscan-by-default
+%patch9338 -p0 -b .ia64-elfloader-cache-flush
+%patch9339 -p0 -b .xkb-dutch-keyboard-layout-fixes
# EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently)
# Update: Also enabled for FC3-testing build to be released soon, which will
# ultimately end up in an official FC3 update eventually as well.
-%if %{build_fc4} || %{build_fc3}
+%if %{build_fc5} || %{build_fc4} || %{build_fc3}
%patch9500 -p0 -b .deassert-ddc-lines
%patch9501 -p0 -b .laptop-modes.patch
@@ -1169,8 +1169,11 @@
%patch9702 -p0 -b .cursor-flicker
%patch9705 -p0 -b .iso8859-compose-files-fdo2592-2156
%patch9706 -p0 -b .lbxproxy-fdo2678-2051
-%patch9707 -p0 -b .nv-hw-fdo2533-1896
-%patch9708 -p0 -b .nv-patch-fdo2380-1752
+
+# Disabled 9707, 9708 as they're included in the nv driver update patch #1675
+#%patch9707 -p0 -b .nv-hw-fdo2533-1896
+#%patch9708 -p0 -b .nv-patch-fdo2380-1752
+
%patch9709 -p0 -b .radeon-cursor-sync-fdo2844-2230
%patch9710 -p0 -b .radeon-render-byteswap-fdo2164-1863
%patch9711 -p0 -b .radeon-set-fb-location-fdo2698-2079
@@ -1182,11 +1185,18 @@
%patch9718 -p0 -b .xset-fdo2258-2166
%patch9719 -p0 -b .battle-libc-wrapper
%patch9720 -p0 -b .gcc4-fix
+%patch9721 -p0 -b .xnest-update-modifier-state-fdo3030-fdo3664
+%patch9722 -p0 -b .xnest-fix-warning-spew-fdo3513
+
+# gcc-4.0.1-4 has a workaround for the volatile over-optimization so
+# disable this patch for now.
+# %patch9723 -p0 -b .libvgahw-workaround-rh161242
+
%endif
########################################################################
# Red Hat custom patches
-%patch10000 -p0 -b .redhat-custom-startup
+%patch10000 -p0 -b .redhat-kt
%if %{build_rhel4}
%patch10001 -p0 -b .redhat-custom-modelines
%endif
@@ -1235,7 +1245,10 @@
%define rhstr Fedora Core 3
%endif
%if %{build_fc4}
-%define rhstr Fedora Core 4 Developmental build
+%define rhstr Fedora Core 4
+%endif
+%if %{build_fc5}
+%define rhstr Fedora Core 5
%endif
%if %{build_rhel4}
%define rhstr Red Hat Enterprise Linux v.4
@@ -1259,9 +1272,12 @@
echo -e "\n\nGenerating architecture specifc host-%{_arch}.def file.\n\n"
cat > xc/config/cf/host-%{_arch}.def << EOF
+/* FIXME: Remove one of these 2 */
#define XFree86CustomVersion "%vendorstring: %{version}-%{release}"
+#define XorgCustomVersion "%vendorstring: %{version}-%{release}"
+
/* Experimental custom messages */
-#define XFree86RedHatCustom YES
+#define XorgRedHatCustom YES
#define BuilderString "Build Host: %(hostname -f)\n"
#define LinuxDistribution LinuxRedHat
@@ -1582,8 +1598,12 @@
# Install pam related files
{
mkdir -p $RPM_BUILD_ROOT/etc/{pam.d,security/console.apps}
- install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/xserver
- install -c -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/xdm
+ install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
+ if [ "%{build_rhel4}" = "1" -o "%{build_fc5}" = "1" ] ; then
+ install -c -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/xdm
+ else
+ install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/xdm
+ fi
touch $RPM_BUILD_ROOT/etc/security/console.apps/xserver
}
# Move OpenGL includes in %{_includedir}/GL instead of the default location,
@@ -1612,13 +1632,6 @@
mkdir -p $RPM_BUILD_ROOT/etc/{X11/fs,rc.d/init.d}
install -c -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/X11/fs/config
install -c -m 755 %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
-# Patch xfs.init to start earlier for gdm early login in FC4:
-# Disabled because it breaks NFS /usr (#156413)
-#%if %{build_fc4}
-#pushd $RPM_BUILD_ROOT/etc/rc.d/init.d
-#patch -p0 < %{PATCH20008}
-#popd
-#%endif
# FIXME: Can Imake do this? Fix up symlinks
{
@@ -3190,37 +3203,6 @@
%{_x11mandir}/man1/fslsfonts.1*
%{_x11mandir}/man1/fstobdf.1*
-### %{name}-libs-data ################################################
-# libs-data includes files which used to be in "libs" but which were moved
-# here so that both x86, and x86_64 libs packages may be installed simultaneously.
-%if %{with_libs_data}
-%files libs-data
-%defattr(-,root,root)
-%dir %{_x11datadir}
-%dir %{_x11datadir}/X11
-%dir %{_x11localedir}
-%{_x11localedir}/*
-%{_x11datadir}/X11/rgb.txt
-# Xcms.txt should be banished from the face of the earth with extreme
-# hostility
-#%{_x11datadir}/X11/Xcms.txt
-%{_x11datadir}/X11/XErrorDB
-%{_x11datadir}/X11/XKeysymDB
-# Exclude i18n DSOs as they're arch specific
-%exclude %dir %{_x11localedir}/%{_lib}
-%exclude %dir %{_x11localedir}/%{_lib}/common
-%exclude %{_x11localedir}/%{_lib}/common/*
-%dir %{_x11mandir}
-%dir %{_x11mandir}/man1
-%dir %{_x11mandir}/man2
-%dir %{_x11mandir}/man3
-%dir %{_x11mandir}/man4
-%dir %{_x11mandir}/man5
-%dir %{_x11mandir}/man6
-%dir %{_x11mandir}/man7
-%dir %{_x11mandir}/man8
-%endif
-
%files libs
%defattr(-,root,root)
# On x86 and other architectures _x11libdir and _x11datadir are the same dir,
@@ -3228,7 +3210,6 @@
# dirs are different on x86_64, we ifarch it here.
# All manpage dirs owned by libs package to guarantee they are owned by some
# installed package because everything pretty much depends on libs being there
-%if ! %{with_libs_data}
%dir %{_x11datadir}
%dir %{_x11datadir}/X11
#%dir %{_x11localedir}
@@ -3252,7 +3233,6 @@
%dir %{_x11mandir}/man6
%dir %{_x11mandir}/man7
%dir %{_x11mandir}/man8
-%endif # ! %{with_libs_data}
%dir %{_x11localedir}
%dir %{_x11localedir}/C
@@ -3622,6 +3602,85 @@
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jul 29 2005 Kristian Høgsberg <krh redhat com> 6.8.2-45
+- Disable xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch and
+ rebuild with gcc-4.0.1-4 which has a workaround for the gcc
+ over-optimization bug.
+
+* Wed Jul 27 2005 Kristian Høgsberg <krh redhat com> 6.8.2-44
+- Update xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch to
+ fix all occurrences of direct PCI config space access. Fixes from
+ Olivier Baudron, comment 28 in #163331.
+
+* Wed Jul 14 2005 Mike A. Harris <mharris redhat com>
+- Fix FC5 spec file typo for virtual libGL Requires in -devel subpackage
+
+* Mon Jul 12 2005 Mike A. Harris <mharris redhat com> 6.8.2-43
+- Added xorg-x11-6.8.2-xnest-update-modifier-state-fdo3030-fdo3664.patch and
+ xorg-x11-6.8.2-xnest-fix-warning-spew-fdo3513.patch to fix Xnest bugs
+ referenced in bug (#162246)
+- Updated xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch to
+ add a log file message about ScreenToScreenCopy being disabled on some
+ GeForce models for bug (#157715)
+- Added xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch to attempt to work
+ around bug (#161242, 162274, 153729, 159106, 160500, 161047, 160470,
+ 160453, 160307, 160777, 151688, 154502, 161566, 160950, 160580, 157556,
+ 161756, 160477, 155416, 160287, 162567, 157593, fdo#2991, fdo#2976,
+ fdo#3557, gnu#22278)
+- Updated xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch to allow dri
+ to be forcibly enabled on Radeon 7000 if desired. (#150174)
+
+* Fri Jul 8 2005 Mike A. Harris <mharris redhat com> 6.8.2-42
+- Added xorg-x11-6.8.2-redhat-nv-disable-s2scopy-on-geforce-6x00.patch to
+ work around "nv" driver bug, by disabling ScreenToScreenCopy on certain
+ GeForce 6200/6800/6800 cards which the problem has been reported on,
+ until there is a real upstream fix, as the current CVS head driver we
+ now have, still suffers from the problem. We may also need to blacklist
+ other cards as new reports come in. (#157715)
+
+* Mon Jul 4 2005 Mike A. Harris <mharris redhat com> 6.8.2-41
+- Added xorg-x11-6.8.2-nv-driver-CVSHEAD-6.8.99.13.patch backport of CVS head
+ nv driver to track the latest bug fixes and hardware support. Hopefully
+ this will also fix critical bug (#157715) also.
+- Disabled patches that are included in the above nv driver update patch:
+ - xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch
+ - xorg-x11-6.8.3-nv-patch-fdo2380-1752.patch
+
+* Thu Jun 30 2005 Mike A. Harris <mharris redhat com> 6.8.2-40
+- Added xorg-x11-6.8.2-xkb-dutch-keyboard-layout-fixes.patch as a proposed
+ fix for Dutch keyboard layout issue (#135233)
+
+* Thu Jun 23 2005 Mike A. Harris <mharris redhat com> 6.8.2-39
+- Updated xdm.pamd to work with new audit system. (#159332)
+- Made copy of xdm.pamd named "xdm-pre-audit-system.pamd" for FC3/FC4 builds.
+- Added xorg-x11-xdm "Requires: pam >= 0.77-66.8" for RHEL-4 builds, and
+ "Requires: pam >= 0.79-10" for FC5 builds. The audit functionality is
+ disabled for FC3/FC4 builds.
+- Added new build target macro "build_fc5" and updated spec file to use
+ it where appropriate.
+
+* Thu Jun 9 2005 Mike A. Harris <mharris redhat com> 6.8.2-38
+- Removed unused legacy with_new_savage_driver macro and conditional
+ spec file code.
+- Added xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch to disable DRI on
+ Radeon 7000/VE hardware to test patch in rawhide prior to inclusion in
+ RHEL4U2. (#150174)
+
+* Mon Jun 6 2005 Mike A. Harris <mharris redhat com>
+- Removed with_libs_data macro as it is no longer useful.
+- Updated "Obsoletes: xorg-x11-libs-data" line to remove versioning
+
+* Mon May 30 2005 Mike A. Harris <mharris redhat com> 6.8.2-37
+- Implemented xorg-x11-6.8.2-redhat-kt.patch new kernel tainting diagnostics
+ patch to aide in troubleshooting reported issues.
+- Removed older redhat-custom patch as the kt patch above replaces it now.
+- s/XFree86CustomVersion/XorgCustomVersion/ in host.def
+- Build for FC5 development.
+
+* Mon May 30 2005 Mike A. Harris <mharris redhat com> 6.8.2-36
+- Added xorg-x11-6.8.2-ia64-elfloader-cache-flush.patch to fix cache flush
+ issue on ia64 systems (#153103)
+============================================================================
* Wed May 25 2005 Mike A. Harris <mharris redhat com> 6.8.2-35
- Remove /usr/X11R6/lib/X11/xinit symlink on non with_Xserver builds to
prevent rpm complaining about unpackaged symlinks on s390 et al. now that
--- xorg-x11-6.8.0-redhat-custom-startup.patch DELETED ---
[Date Prev][Date Next] [Thread Prev][Thread Next]
[Thread Index]
[Date Index]
[Author Index]