rpms/xorg-x11-drv-radeonhd/F-7 xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch, 1.1, 1.2 xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch, 1.1, 1.2 xorg-x11-drv-radeonhd.spec, 1.15, 1.16

[Hans Ulrich Niedermann (ndim)]

Author: ndim

Update of /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23277

Modified Files:
	xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch 
	xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch 
	xorg-x11-drv-radeonhd.spec 
Log Message:
* Fri Dec 28 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.1.0-0.2.20071228git.fc7.2
- Use same *.patch files as F-8 and rawhide.


xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch:

Index: xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-7/xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch	13 Nov 2007 18:30:03 -0000	1.1
+++ xorg-x11-drv-radeonhd-Fix-location-of-rhd_conntest-in-msgs.patch	28 Dec 2007 20:25:20 -0000	1.2
@@ -1,22 +1,14 @@
 diff --git a/src/rhd_id.c b/src/rhd_id.c
-index f06bc3e..c4c8aef 100644
+index 4790b41..6d2bff9 100644
 --- a/src/rhd_id.c
 +++ b/src/rhd_id.c
-@@ -612,14 +612,12 @@ RHDCardIdentify(ScrnInfoPtr pScrn)
-     xf86Msg(X_NONE, "\t"
- 	    "If your card does not work or does not work optimally\n\t"
- 	    "please contact radeonhd at opensuse.org to help rectify this.\n\t"
--	    "Include your X log, the full name of the device\n\t"
--	    "and the rhd_conntest (found in utils/conntest) output.\n");
- #else
-     xf86Msg(X_NONE, "\t"
+@@ -636,7 +636,7 @@ RHDCardIdentify(ScrnInfoPtr pScrn)
  	    "Your card might not work or might not work optimally.\n\t"
  	    "To rectify this, please contact radeonhd at opensuse.org.\n\t"
--	    "Include your X log, the full name of the device\n\t"
+ 	    "Include your X log, the full name of the device\n\t"
 -	    "and the rhd_conntest (found in utils/conntest) output.\n");
- #endif
-+	    "Include your X log, the full name of the device\n\t"
 +	    "and the rhd_conntest (found in /usr/bin) output.\n");
+ #endif
      return NULL;
  }
 diff --git a/utils/conntest/README b/utils/conntest/README

xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch:

Index: xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-7/xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch	1 Nov 2007 14:29:07 -0000	1.1
+++ xorg-x11-drv-radeonhd-Generate-xinf-file-for-hwdata-from-rhd_id.c.patch	28 Dec 2007 20:25:20 -0000	1.2
@@ -2,7 +2,6 @@
 From: Hans Ulrich Niedermann <hun at n-dimensional.de>
 Date: Tue, 30 Oct 2007 23:34:41 +0100
 Subject: [PATCH] Generate xinf file for hwdata from rhd_id.c
-X-See-URL: http://radeonhd.lauft.net/patches/
 
 Takes all chipset and card data from rhd_id.c and prints them all
 as an xinf file suitable for installation in
@@ -19,7 +18,7 @@
  3 files changed, 72 insertions(+), 0 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9c41885..991a558 100644
+index 2eb7cba..593bd83 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -18,6 +18,7 @@ AM_MAINTAINER_MODE
@@ -31,24 +30,27 @@
  
  AH_TOP([#ifndef _CONFIG_H])
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 8746daf..9598455 100644
+index 671e4d6..7804d9a 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -88,3 +88,9 @@ libatom_la_SOURCES = \
+@@ -92,3 +92,12 @@ libatom_la_SOURCES = \
  radeonhd_drv_la_LIBADD = libatom.la
  
  endif
 +
++check_PROGRAMS = print-xinf-data
++TESTS = print-xinf-data
 +noinst_PROGRAMS = print-xinf-data
 +
 +print_xinf_data_SOURCES = rhd_id.c
++nodist_print_xinf_data_SOURCES = git_version.h
 +print_xinf_data_CPPFLAGS = $(AM_CPPFLAGS) -DPRINT_XINF_DATA
 +print_xinf_data_CFLAGS = $(AM_CFLAGS) @PEDANTIC_CFLAGS@
 diff --git a/src/rhd_id.c b/src/rhd_id.c
-index bc78a63..9781569 100644
+index 4790b41..10c1ca1 100644
 --- a/src/rhd_id.c
 +++ b/src/rhd_id.c
-@@ -635,3 +635,67 @@ RHDCardIdentify(ScrnInfoPtr pScrn)
+@@ -640,3 +640,67 @@ RHDCardIdentify(ScrnInfoPtr pScrn)
  #endif
      return NULL;
  }
@@ -116,6 +118,3 @@
 +
 +#endif /* XSERVER_LIBPCIACCESS */
 +#endif /* PRINT_XINF_DATA */
--- 
-1.5.3.4
-


Index: xorg-x11-drv-radeonhd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-radeonhd/F-7/xorg-x11-drv-radeonhd.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-radeonhd.spec	28 Dec 2007 19:32:08 -0000	1.15
+++ xorg-x11-drv-radeonhd.spec	28 Dec 2007 20:25:20 -0000	1.16
@@ -31,7 +31,7 @@
 Summary:       Xorg X11 radeonhd driver for AMD GPG r5xx/r6xx Chipsets
 Name:          xorg-x11-drv-radeonhd
 Version:       1.1.0
-Release:       0.2%{?alphatag}%{?dist}.1
+Release:       0.2%{?alphatag}%{?dist}.2
 
 License:       MIT
 Group:         User Interface/X Hardware Support
@@ -140,6 +140,9 @@
 %endif
 
 %changelog
+* Fri Dec 28 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.1.0-0.2.20071228git.fc7.2
+- Use same *.patch files as F-8 and rawhide.
+
 * Fri Dec 28 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.1.0-0.2.20071228git.fc7.1
 - Warn on potential compatibility issues with F-8 in README.fedora.