rpms/bchunk/F-10 01-track-size.dpatch, NONE, 1.1 bchunk.spec, 1.13, 1.14

[konradm]

Author: konradm

Update of /cvs/pkgs/rpms/bchunk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28961

Modified Files:
	bchunk.spec 
Added Files:
	01-track-size.dpatch 
Log Message:
* Wed Aug 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0-9
- Add Debian's patch to fix wrong file size calculations.



--- NEW FILE 01-track-size.dpatch ---
#!/bin/sh /usr/share/dpatch/dpatch-run
## 01-track-size.dpatch by Piotr Kaczuba <pepe at attika.ath.cx>
##
## DP: Fix wrong track size calculation when having multiple tracks in one image
## DP: (Closes: #261274).

@DPATCH@

diff -Naur bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c
--- bchunk-1.2.0.orig/bchunk.c	2004-06-29 20:42:33.000000000 +0000
+++ bchunk-1.2.0/bchunk.c	2006-09-08 18:19:59.000000000 +0000
@@ -476,7 +476,7 @@
 			if (verbose)
 				printf(" (startsect %ld ofs %ld)", track->startsect, track->start);
 			if ((prevtrack) && (prevtrack->stopsect < 0)) {
-				prevtrack->stopsect = track->startsect;
+				prevtrack->stopsect = track->startsect - 1;
 				prevtrack->stop = track->start - 1;
 			}
 		}
@@ -484,7 +484,7 @@
 	
 	if (track) {
 		fseek(binf, 0, SEEK_END);
-		track->stop = ftell(binf);
+		track->stop = ftell(binf) - 1;
 		track->stopsect = track->stop / SECTLEN;
 	}
 	


Index: bchunk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bchunk/F-10/bchunk.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- bchunk.spec	8 Feb 2008 21:44:17 -0000	1.13
+++ bchunk.spec	12 Aug 2009 19:17:26 -0000	1.14
@@ -1,11 +1,12 @@
 Summary: CD image format converter from .bin/.cue to .iso/.cdr
 Name: bchunk
 Version: 1.2.0
-Release: 7
+Release: 9%{?dist}
 URL: http://he.fi/bchunk/
 License: GPLv2+
 Group: Applications/Archiving
-Source: http://he.fi/bchunk/%{name}-%{version}.tar.gz
+Source0: http://he.fi/bchunk/bchunk-%{version}.tar.gz
+Patch0: 01-track-size.dpatch
 Patch1: bchunk-1.1.1-CFLAGS.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
@@ -18,10 +19,11 @@ CD-writing programs.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 %build
-CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,6 +42,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bchunk.1.gz
 
 %changelog
+* Wed Aug 12 2009 Conrad Meyer <konrad at tylerc.org> - 1.2.0-9
+- Add Debian's patch to fix wrong file size calculations.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Fri Feb 08 2008 Michael Schwendt <mschwendt at fedoraproject.org>
 - rebuilt for GCC 4.3 as requested by Fedora Release Engineering