rpms/libpciaccess/devel .cvsignore, 1.8, 1.9 libpciaccess-fd-cache.patch, 1.3, 1.4 libpciaccess.spec, 1.26, 1.27 sources, 1.10, 1.11 libpciaccess-0.10.6-no-rom-fallback.patch, 1.1, NONE libpciaccess-boot-vga.patch, 1.1, NONE libpciaccess-vga-arbiter.patch, 1.5, NONE

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/libpciaccess/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30108

Modified Files:
	.cvsignore libpciaccess-fd-cache.patch libpciaccess.spec 
	sources 
Removed Files:
	libpciaccess-0.10.6-no-rom-fallback.patch 
	libpciaccess-boot-vga.patch libpciaccess-vga-arbiter.patch 
Log Message:
* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 0.10.9-1
- rebase to latest upstream release - drop patches



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	27 Jul 2009 05:11:39 -0000	1.8
+++ .cvsignore	25 Sep 2009 01:55:53 -0000	1.9
@@ -1 +1 @@
-libpciaccess-0.10.6.tar.bz2
+libpciaccess-0.10.9.tar.bz2

libpciaccess-fd-cache.patch:
 linux_sysfs.c |   89 +++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 54 insertions(+), 35 deletions(-)

Index: libpciaccess-fd-cache.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess-fd-cache.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libpciaccess-fd-cache.patch	21 Apr 2009 14:40:05 -0000	1.3
+++ libpciaccess-fd-cache.patch	25 Sep 2009 01:55:53 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up libpciaccess-0.10.5/src/linux_sysfs.c.cache libpciaccess-0.10.5/src/linux_sysfs.c
---- libpciaccess-0.10.5/src/linux_sysfs.c.cache	2008-10-31 11:40:09.000000000 -0400
-+++ libpciaccess-0.10.5/src/linux_sysfs.c	2009-04-21 09:36:38.000000000 -0400
+diff -up libpciaccess-0.10.9/src/linux_sysfs.c.da libpciaccess-0.10.9/src/linux_sysfs.c
+--- libpciaccess-0.10.9/src/linux_sysfs.c.da	2009-09-24 10:06:55.000000000 +1000
++++ libpciaccess-0.10.9/src/linux_sysfs.c	2009-09-25 11:51:21.000000000 +1000
 @@ -57,6 +57,8 @@
  
  static void pci_device_linux_sysfs_enable(struct pci_device *dev);
@@ -10,8 +10,8 @@ diff -up libpciaccess-0.10.5/src/linux_s
  static int pci_device_linux_sysfs_read_rom( struct pci_device * dev,
      void * buffer );
  
-@@ -76,7 +78,7 @@ static int pci_device_linux_sysfs_write(
-     pciaddr_t * bytes_written );
+@@ -79,7 +81,7 @@ static int pci_device_linux_sysfs_boot_v
+ static int pci_device_linux_sysfs_has_kernel_driver(struct pci_device *dev);
  
  static const struct pci_system_methods linux_sysfs_methods = {
 -    .destroy = NULL,
@@ -19,7 +19,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
      .destroy_device = NULL,
      .read_rom = pci_device_linux_sysfs_read_rom,
      .probe = pci_device_linux_sysfs_probe,
-@@ -368,6 +370,53 @@ pci_device_linux_sysfs_read_rom( struct 
+@@ -382,6 +384,53 @@ pci_device_linux_sysfs_read_rom( struct 
      return err;
  }
  
@@ -73,7 +73,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
  
  static int
  pci_device_linux_sysfs_read( struct pci_device * dev, void * data,
-@@ -384,23 +433,9 @@ pci_device_linux_sysfs_read( struct pci_
+@@ -398,23 +447,9 @@ pci_device_linux_sysfs_read( struct pci_
  	*bytes_read = 0;
      }
  
@@ -99,7 +99,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
  
      while ( temp_size > 0 ) {
  	const ssize_t bytes = pread64( fd, data_bytes, temp_size, offset );
-@@ -422,7 +457,6 @@ pci_device_linux_sysfs_read( struct pci_
+@@ -436,7 +471,6 @@ pci_device_linux_sysfs_read( struct pci_
  	*bytes_read = size - temp_size;
      }
  
@@ -107,7 +107,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
      return err;
  }
  
-@@ -442,23 +476,9 @@ pci_device_linux_sysfs_write( struct pci
+@@ -456,23 +490,9 @@ pci_device_linux_sysfs_write( struct pci
  	*bytes_written = 0;
      }
  
@@ -133,7 +133,7 @@ diff -up libpciaccess-0.10.5/src/linux_s
  
      while ( temp_size > 0 ) {
  	const ssize_t bytes = pwrite64( fd, data_bytes, temp_size, offset );
-@@ -480,7 +500,6 @@ pci_device_linux_sysfs_write( struct pci
+@@ -494,7 +514,6 @@ pci_device_linux_sysfs_write( struct pci
  	*bytes_written = size - temp_size;
      }
  


Index: libpciaccess.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/libpciaccess.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- libpciaccess.spec	5 Aug 2009 23:48:16 -0000	1.26
+++ libpciaccess.spec	25 Sep 2009 01:55:53 -0000	1.27
@@ -2,8 +2,8 @@
 %define gitrev e392082abb5696c8837224da86cc0af4f21d7010
 
 Name:           libpciaccess
-Version:        0.10.6
-Release:        7%{?dist}
+Version:        0.10.9
+Release:        1%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -19,9 +19,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Patch0:		libpciaccess-fd-cache.patch
 Patch2:		libpciaccess-rom-size.patch
-Patch3:         libpciaccess-boot-vga.patch
-Patch4:		libpciaccess-vga-arbiter.patch
-Patch5:         libpciaccess-0.10.6-no-rom-fallback.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig xorg-x11-util-macros
 Requires:       hwdata
@@ -43,9 +40,6 @@ Development package for libpciaccess.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .cache
 %patch2 -p1 -b .rom-size
-%patch3 -p1 -b .bootvga
-%patch4 -p1 -b .vgaarb
-%patch5 -p1 -b .romfall
 
 %build
 autoreconf -v --install
@@ -76,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Fri Sep 25 2009 Dave Airlie <airlied at redhat.com> 0.10.9-1
+- rebase to latest upstream release - drop patches
+
 * Thu Aug 06 2009 Dave Airlie <airlied at redhat.com> 0.10.6-7
 - disable rom reading fallbacks
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libpciaccess/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	27 Jul 2009 05:11:39 -0000	1.10
+++ sources	25 Sep 2009 01:55:53 -0000	1.11
@@ -1 +1 @@
-ba25eb7582f69428648e8c67564d68e5  libpciaccess-0.10.6.tar.bz2
+685cb20e7a6165bc010972f1183addbd  libpciaccess-0.10.9.tar.bz2


--- libpciaccess-0.10.6-no-rom-fallback.patch DELETED ---


--- libpciaccess-boot-vga.patch DELETED ---


--- libpciaccess-vga-arbiter.patch DELETED ---