rpms/cdparanoia/devel cdparanoia-III-10.0-headers.patch, NONE, 1.1 cdparanoia-III-alpha9.8.scsi-setspeed.patch, 1.1, 1.2 cdparanoia.spec, 1.32, 1.33

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/cdparanoia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6832

Modified Files:
	cdparanoia-III-alpha9.8.scsi-setspeed.patch cdparanoia.spec 
Added Files:
	cdparanoia-III-10.0-headers.patch 
Log Message:
fix license tag

cdparanoia-III-10.0-headers.patch:

--- NEW FILE cdparanoia-III-10.0-headers.patch ---
diff -up cdparanoia-III-10.0/header.c.headers cdparanoia-III-10.0/header.c
diff -up cdparanoia-III-10.0/paranoia/gap.c.headers cdparanoia-III-10.0/paranoia/gap.c
--- cdparanoia-III-10.0/paranoia/gap.c.headers	2008-05-12 17:20:49.000000000 -0400
+++ cdparanoia-III-10.0/paranoia/gap.c	2008-07-15 10:24:21.000000000 -0400
@@ -9,6 +9,7 @@
 #include "p_block.h"
 #include "cdda_paranoia.h"
 #include "gap.h"
+#include <string.h>
 
 /**** Gap analysis code ***************************************************/
 

cdparanoia-III-alpha9.8.scsi-setspeed.patch:

Index: cdparanoia-III-alpha9.8.scsi-setspeed.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdparanoia/devel/cdparanoia-III-alpha9.8.scsi-setspeed.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdparanoia-III-alpha9.8.scsi-setspeed.patch	4 Mar 2008 21:09:05 -0000	1.1
+++ cdparanoia-III-alpha9.8.scsi-setspeed.patch	15 Jul 2008 14:29:30 -0000	1.2
@@ -1,7 +1,8 @@
---- cdparanoia-III-alpha9.8/interface/scsi_interface.c_orig	2008-02-02 21:14:07.000000000 +0100
-+++ cdparanoia-III-alpha9.8/interface/scsi_interface.c	2008-02-02 21:13:41.000000000 +0100
-@@ -1565,6 +1565,15 @@
-   return ret;
+diff -up cdparanoia-III-10.0/interface/scsi_interface.c.setspeed cdparanoia-III-10.0/interface/scsi_interface.c
+--- cdparanoia-III-10.0/interface/scsi_interface.c.setspeed	2008-05-14 14:59:15.000000000 -0400
++++ cdparanoia-III-10.0/interface/scsi_interface.c	2008-07-15 10:23:42.000000000 -0400
+@@ -1616,6 +1616,14 @@ unsigned char *scsi_inquiry(cdrom_drive 
+   return (d->sg_buffer);
  }
  
 +/* Set operating speed */
@@ -12,11 +13,10 @@
 +  else
 +    return 0;
 +}
-+
- int scsi_init_drive(cdrom_drive *d){
-   int ret, is_sgio;
  
-@@ -1609,7 +1618,7 @@
+ int scsi_init_drive(cdrom_drive *d){
+   int ret;
+@@ -1660,7 +1668,7 @@ int scsi_init_drive(cdrom_drive *d){
  
    d->read_toc = (!memcmp(d->drive_model, "IMS", 3) && !d->is_atapi) ? scsi_read_toc2 : 
      scsi_read_toc;


Index: cdparanoia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdparanoia/devel/cdparanoia.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cdparanoia.spec	19 Jun 2008 19:44:32 -0000	1.32
+++ cdparanoia.spec	15 Jul 2008 14:29:30 -0000	1.33
@@ -2,8 +2,8 @@
 
 Name: cdparanoia
 Version: 10.0
-Release: 2%{?dist}
-License: GPL
+Release: 3%{?dist}
+License: GPLv3
 Group: Applications/Multimedia
 Source: http://downloads.xiph.org/releases/%{name}/%{name}-III-%{version}.src.tgz
 Patch0: cdparanoia-III-alpha9.8.nostrip.patch
@@ -18,7 +18,7 @@
 Patch9: cdparanoia-III-alpha9.8.smalldma.patch
 Patch10: cdparanoia-III-alpha9.8.lm.patch
 Patch11: cdparanoia-III-alpha9.8.scsi-setspeed.patch
-Patch12: cdparanoia-III-alpha9.8-headers.patch
+Patch12: cdparanoia-III-10.0-headers.patch
 Url: http://www.xiph.org/paranoia/index.html
 BuildRoot: %{_tmppath}/cdparanoia-%{version}-root
 Requires: cdparanoia-libs = %{version}-%{release}
@@ -39,6 +39,8 @@
 Summary: Development tools for libcdda_paranoia (Paranoia III).
 Group: Development/Libraries
 Requires: cdparanoia-libs = %{version}-%{release}
+# Some of the headers are LGPLv3
+License: GPLv3 and LGPLv3
 
 %description -n cdparanoia-devel
 The cdparanoia-devel package contains the static libraries and header
@@ -47,6 +49,7 @@
 %package -n cdparanoia-libs
 Summary: Libraries for libcdda_paranoia (Paranoia III).
 Group: Development/Libraries
+License: GPLv3
 
 %description -n cdparanoia-libs
 The cdparanoia-libs package contains the dynamic libraries needed for
@@ -125,6 +128,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa at redhat.com> 10.0-3
+- fix license tag
+- fix headers, setspeed patch to apply with fuzz=0
+
 * Thu Jun 19 2008 Adam Jackson <ajax at redhat.com> 10.0-2
 - cdparanoia 10.