packages: xorg-xserver-server/xorg-xserver-server-pic-libxf86config.patch, ...

[arekm]

Author: arekm                        Date: Tue Apr 27 06:40:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.8.0.901

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server-pic-libxf86config.patch (1.1 -> 1.2) , xorg-xserver-server.spec (1.230 -> 1.231) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-pic-libxf86config.patch
diff -u packages/xorg-xserver-server/xorg-xserver-server-pic-libxf86config.patch:1.1 packages/xorg-xserver-server/xorg-xserver-server-pic-libxf86config.patch:1.2
--- packages/xorg-xserver-server/xorg-xserver-server-pic-libxf86config.patch:1.1	Sun Nov  2 16:03:26 2008
+++ packages/xorg-xserver-server/xorg-xserver-server-pic-libxf86config.patch	Tue Apr 27 08:40:07 2010
@@ -1,25 +1,10 @@
-From 6344659a33a7c192dffe6e796c771d02f78da5e5 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax at redhat.com>
-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
-

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.230 packages/xorg-xserver-server/xorg-xserver-server.spec:1.231
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.230	Tue Apr 13 14:38:54 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Tue Apr 27 08:40:07 2010
@@ -20,12 +20,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
@@ -406,15 +406,14 @@
 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
@@ -473,10 +472,9 @@
 %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*
@@ -551,6 +549,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.231  2010/04/27 06:40:07  arekm
+- up to 1.8.0.901
+
 Revision 1.230  2010/04/13 12:38:54  draenog
 - these two accelerometers are not mice (based on Fedora)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server-pic-libxf86config.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.230&r2=1.231&f=u