From 3d2be38e2dd7371dae0c6f28920b9d674f30abe3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 27 Apr 2010 06:40:07 +0000 Subject: [PATCH] - up to 1.8.0.901 Changed files: xorg-xserver-server-pic-libxf86config.patch -> 1.2 xorg-xserver-server.spec -> 1.231 --- xorg-xserver-server-pic-libxf86config.patch | 31 ++++++--------------- xorg-xserver-server.spec | 18 ++++++------ 2 files changed, 16 insertions(+), 33 deletions(-) diff --git a/xorg-xserver-server-pic-libxf86config.patch b/xorg-xserver-server-pic-libxf86config.patch index efdd2db..f0a9c9f 100644 --- a/xorg-xserver-server-pic-libxf86config.patch +++ b/xorg-xserver-server-pic-libxf86config.patch @@ -1,25 +1,10 @@ -From 6344659a33a7c192dffe6e796c771d02f78da5e5 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 1 Nov 2007 15:02:24 -0400 -Subject: [PATCH] Build libxf86config with -fPIC. - ---- - hw/xfree86/parser/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am -index 849ee8b..0691158 100644 ---- a/hw/xfree86/parser/Makefile.am -+++ b/hw/xfree86/parser/Makefile.am -@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \ - DRI.c \ - Extensions.c +--- xorg-server-1.8.0.901/hw/xfree86/parser/Makefile.am~ 2010-04-23 05:19:28.000000000 +0200 ++++ xorg-server-1.8.0.901/hw/xfree86/parser/Makefile.am 2010-04-27 08:16:45.772678719 +0200 +@@ -35,6 +35,7 @@ + libxf86config_a_CFLAGS = $(AM_CFLAGS) --AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC -fvisibility=hidden + AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ ++ -fPIC -fvisibility=hidden \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DDATADIR=\"$(datadir)\" - EXTRA_DIST = \ - Configint.h \ --- -1.5.3.4 - diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec index 5d6c876..22bb727 100644 --- a/xorg-xserver-server.spec +++ b/xorg-xserver-server.spec @@ -19,12 +19,12 @@ Summary: X.org server Summary(pl.UTF-8): Serwer X.org Name: xorg-xserver-server -Version: 1.8.0 +Version: 1.8.0.901 Release: %{rel}%{?with_multigl:.mgl} License: MIT Group: X11/Servers Source0: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2 -# Source0-md5: 7cec3a11890bb53f4a07854319360348 +# Source0-md5: 5326bc5e84f2e3455321ab2baed26362 Source1: 10-quirks.conf Source2: xserver.pamd Patch0: %{name}-xwrapper.patch @@ -405,15 +405,14 @@ rm -rf $RPM_BUILD_ROOT install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver install -d $RPM_BUILD_ROOT/etc/{security/console.apps,X11/xorg.conf.d} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input} +install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d + :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a} -%if %{with udev} -mv $RPM_BUILD_ROOT%{_prefix}/etc/X11/xorg.conf.d/10-evdev.conf $RPM_BUILD_ROOT/etc/X11/xorg.conf.d -install %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-quirks.conf -%endif +install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/10-quirks.conf %if %{with multigl} cd $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions @@ -472,10 +471,9 @@ fi %config(missingok) /etc/security/console.apps/xserver %{?with_dbus:/etc/dbus-1/system.d/xorg-server.conf} %dir /etc/X11/xorg.conf.d -%if %{with udev} -%config(noreplace) %verify(not md5 mtime size) /etc/X11/xorg.conf.d/10-evdev.conf -%config(noreplace) %verify(not md5 mtime size) /etc/X11/xorg.conf.d/10-quirks.conf -%endif +%dir %{_datadir}/X11/xorg.conf.d +# overwrite these settings with local configs in /etc/X11/xorg.conf.d +%verify(not md5 mtime size) %{_datadir}/X11/xorg.conf.d/*.conf %{_mandir}/man1/Xorg.1x* %{_mandir}/man1/Xserver.1x* %{_mandir}/man1/cvt.1* -- 2.44.0