rpms/pycdio/F-11 pycdio-remove-get-devices-compensation.patch, NONE, 1.1 pycdio.spec, 1.1, 1.2

[Jay Greguske]

Author: jgreguske

Update of /cvs/pkgs/rpms/pycdio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17287

Modified Files:
	pycdio.spec 
Added Files:
	pycdio-remove-get-devices-compensation.patch 
Log Message:
Off-by-one compensation in get_devices_* not needed anymore



pycdio-remove-get-devices-compensation.patch:
 cdio.py |   16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

--- NEW FILE pycdio-remove-get-devices-compensation.patch ---
--- cdio.py
+++ cdio.py2
@@ -1,6 +1,4 @@
-#  $Id: cdio.py,v 1.6 2008/05/01 16:55:03 karl Exp $
-#
-#  Copyright (C) 2006, 2008 Rocky Bernstein <rocky at gnu.org>
+#  Copyright (C) 2006, 2008, 2009 Rocky Bernstein <rocky at gnu.org>
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -138,9 +136,7 @@ def get_devices_ret(driver_id=pycdio.DRIVER_UNKNOWN):
     afterwards. Giving the driver back facilitates this, and speeds things
     up for libcdio as well.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_ret(driver_id)[1:]
+    return pycdio.get_devices_ret(driver_id)
 
 def get_devices_with_cap(capabilities, any=False):
     """
@@ -160,9 +156,7 @@ def get_devices_with_cap(capabilities, any=False):
     dereferencing the the value is NULL. This also means nothing was
     found.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_with_cap(capabilities, any)[1:]
+    return pycdio.get_devices_with_cap(capabilities, any)
 
 def get_devices_with_cap_ret(capabilities, any=False):
     """
@@ -174,9 +168,7 @@ def get_devices_with_cap_ret(capabilities, any=False):
     and then *open* it afterwards. Giving the driver back facilitates this,
       and speeds things up for libcdio as well.
     """
-    # FIXME: SWIG code is not removing a parameter properly, hence the [1:]
-    # at the end
-    return pycdio.get_devices_with_cap_ret(capabilities, any)[1:]
+    return pycdio.get_devices_with_cap_ret(capabilities, any)
 
 def have_driver(driver_id):
     """


Index: pycdio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pycdio/F-11/pycdio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pycdio.spec	29 Jul 2009 20:21:58 -0000	1.1
+++ pycdio.spec	28 Sep 2009 19:51:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		pycdio
 Version:	0.15
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Python interface to the CD Input and Control library
 
 Group:		Development/Libraries
@@ -13,6 +13,7 @@ Source0:	ftp://ftp.gnu.org/pub/gnu/libcd
 # Remove shebangs in the modules
 # a patch was emailed and accepted on libcdio-pycdio-devel at gnu.org
 Patch0:		pycdio-remove-shebangs.patch
+Patch1:		pycdio-remove-get-devices-compensation.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	python-devel,python-setuptools,libcdio-devel,swig
@@ -26,6 +27,7 @@ device-dependent properties of a CD-ROM 
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,8 @@ rm -rf %{buildroot}
 %doc README.txt
 
 %changelog
+* Mon Sep 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-4
+- Off-by-one compensation in get_devices_* not needed anymore
 * Tue Jul 28 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-3
 - Added a patch to remove unnecessary shebangs
 * Mon Jul 27 2009 Jay Greguske <jgregusk at redhat.com> - 0.15-2