rpms/xorg-x11-server/F-13 xserver-1.8-no-hardcoded-etc.patch, NONE, 1.1 .cvsignore, 1.84, 1.85 sources, 1.79, 1.80 xorg-x11-server.spec, 1.510, 1.511 xserver-1.7.4-owner-events.patch, 1.1, NONE xserver-1.8-merge-driver.patch, 1.1, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24412

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Added Files:
	xserver-1.8-no-hardcoded-etc.patch 
Removed Files:
	xserver-1.7.4-owner-events.patch 
	xserver-1.8-merge-driver.patch 
Log Message:
* Tue Apr 06 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.0-1
- xserver 1.8.0
- Drop merged patches.
- Rename xdmx client to dmxinfo (change upstream).
- xserver-1.8-no-hardcoded-etc.patch: don't hardcode $prefix/etc for the
  server-installed 10-evdev.conf.


xserver-1.8-no-hardcoded-etc.patch:
 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE xserver-1.8-no-hardcoded-etc.patch ---
>From 7fc78783018cf2ce27f8e6829f9eff1d9032541c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed, 7 Apr 2010 09:27:59 +1000
Subject: [PATCH] config: don't hardcode /etc for 10-evdev.conf

Use sysconfdir instead to avoid amusements like /usr/etc/ and the like.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 config/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/config/Makefile.am b/config/Makefile.am
index eed7454..2e468cf 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -9,7 +9,7 @@ AM_CFLAGS += $(UDEV_CFLAGS)
 libconfig_la_SOURCES += udev.c
 libconfig_la_LIBADD = $(UDEV_LIBS)
 
-xorgconfddir = $(prefix)/etc/X11/$(XF86CONFIGDIR)
+xorgconfddir = $(sysconfdir)/X11/$(XF86CONFIGDIR)
 xorgconfd_DATA = 10-evdev.conf
 
 else
-- 
1.6.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-13/.cvsignore,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- .cvsignore	19 Mar 2010 04:12:56 -0000	1.84
+++ .cvsignore	7 Apr 2010 00:13:30 -0000	1.85
@@ -1 +1 @@
-xorg-server-20100319.tar.xz
+xorg-server-1.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-13/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- sources	19 Mar 2010 04:12:56 -0000	1.79
+++ sources	7 Apr 2010 00:13:31 -0000	1.80
@@ -1 +1 @@
-c98c25437ee1cca9799bbfda721f0395  xorg-server-20100319.tar.xz
+7cec3a11890bb53f4a07854319360348  xorg-server-1.8.0.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-13/xorg-x11-server.spec,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -p -r1.510 -r1.511
--- xorg-x11-server.spec	6 Apr 2010 05:28:07 -0000	1.510
+++ xorg-x11-server.spec	7 Apr 2010 00:13:31 -0000	1.511
@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20100319
+#define gitdate 20100319
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.7.99.902
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.8.0
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -86,9 +86,7 @@ Patch6052: xserver-1.8-udev-warning.patc
 # fallback to vesa when module is missing seems broken
 Patch6053: xserver-1.8-disable-vboxvideo.patch
 
-# 543647
-Patch6054: xserver-1.7.4-owner-events.patch
-Patch6055: xserver-1.8-merge-driver.patch
+Patch6054: xserver-1.8-no-hardcoded-etc.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -402,6 +400,8 @@ find %{inst_srcdir}/hw/xfree86 -name \*.
     rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
     rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
     find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
+    # we install our own 
+    rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/10-evdev.conf
 %if !%{with_hw_servers}
     rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xorg-server.pc
     rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/xorg-server.m4
@@ -490,7 +490,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/dmxtodmx
 %{_bindir}/dmxwininfo
 %{_bindir}/vdltodmx
-%{_bindir}/xdmx
+%{_bindir}/dmxinfo
 %{_bindir}/xdmxconfig
 %{_mandir}/man1/Xdmx.1*
 %{_mandir}/man1/dmxtodmx.1*
@@ -526,6 +526,13 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Apr 06 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.0-1
+- xserver 1.8.0
+- Drop merged patches.
+- Rename xdmx client to dmxinfo (change upstream).
+- xserver-1.8-no-hardcoded-etc.patch: don't hardcode $prefix/etc for the
+  server-installed 10-evdev.conf.
+
 * Tue Apr 06 2010 Peter Hutterer <peter.hutterer at redhat.com>
 - Auto-append the gitdate to the Release whenever it is set.
 


--- xserver-1.7.4-owner-events.patch DELETED ---


--- xserver-1.8-merge-driver.patch DELETED ---