From 4e6447f36d05056edc5fffc6f4044219dfbce6be Mon Sep 17 00:00:00 2001
From: Jay Fenlason <dajt@fedoraproject.org>
Date: Jan 11 2010 22:04:19 +0000
Subject: - New upstream release, which obsoletes both patches.

- Correct the Source url to point to sourceforge's current path.

---

diff --git a/.cvsignore b/.cvsignore
index 122222a..c1ad6cf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1 @@
-dvgrab-2.0.tar.gz
-dvgrab-2.1.tar.gz
-dvgrab-3.0.tar.gz
-dvgrab-3.1.tar.gz
-dvgrab-3.2.tar.gz
-dvgrab-3.4.tar.gz
+dvgrab-3.5.tar.gz
diff --git a/dvgrab-3.3-fix-gcc-4.4-build.patch b/dvgrab-3.3-fix-gcc-4.4-build.patch
deleted file mode 100644
index de1875f..0000000
--- a/dvgrab-3.3-fix-gcc-4.4-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Narup dvgrab-3.2.orig/error.cc dvgrab-3.2/error.cc
---- dvgrab-3.2.orig/error.cc	2007-07-06 15:04:24.000000000 -0400
-+++ dvgrab-3.2/error.cc	2009-02-03 14:29:29.395277495 -0500
-@@ -32,6 +32,7 @@
- #include <iostream>
- #include <sstream>
- #include <iomanip>
-+#include <cstdio>
- 
- using std::ostringstream;
- using std::string;
-diff -Narup dvgrab-3.2.orig/smiltime.cc dvgrab-3.2/smiltime.cc
---- dvgrab-3.2.orig/smiltime.cc	2008-07-21 23:33:35.000000000 -0400
-+++ dvgrab-3.2/smiltime.cc	2009-02-03 14:28:55.540346200 -0500
-@@ -27,6 +27,7 @@
- #include <iostream>
- #include <iomanip>
- #include <sstream>
-+#include <cstdio>
- 
- #include <stdlib.h>
- #include <math.h>
diff --git a/dvgrab-3.4-set-proper-retval-on-failure.patch b/dvgrab-3.4-set-proper-retval-on-failure.patch
deleted file mode 100644
index eeb095a..0000000
--- a/dvgrab-3.4-set-proper-retval-on-failure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Set retval to 1 if we get an error, to make life easier for folks
-who wrap dvgrab to tell if something went wrong (rhbz #486061).
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
-
---- dvgrab-3.4/main.cc.orig	2009-03-19 16:12:55.417171454 -0400
-+++ dvgrab-3.4/main.cc	2009-03-19 16:12:22.321109256 -0400
-@@ -93,6 +93,8 @@ int rt_raisepri (int pri)
- 
- int main( int argc, char *argv[] )
- {
-+	int ret = 0;
-+
- 	fcntl( fileno( stderr ), F_SETFL, O_NONBLOCK );
- 	try
- 	{
-@@ -137,13 +139,15 @@ int main( int argc, char *argv[] )
- 	{
- 		fprintf( stderr, "Error: %s\n", s.c_str() );
- 		fflush( stderr );
-+		ret = 1;
- 	}
- 	catch ( ... )
- 	{
- 		fprintf( stderr, "Error: unknown\n" );
- 		fflush( stderr );
-+		ret = 1;
- 	}
- 
- 	fprintf( stderr, "\n" );
--	return 0;
-+	return ret;
- }
diff --git a/dvgrab.spec b/dvgrab.spec
index 96d65c3..ee9d714 100644
--- a/dvgrab.spec
+++ b/dvgrab.spec
@@ -1,13 +1,11 @@
 Summary:        Utility to capture video from a DV camera
 Name:           dvgrab
-Version:        3.4
-Release:        3%{?dist}
+Version:        3.5
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.kinodv.org/
-Source:         http://dl.sf.net/kino/dvgrab-%{version}.tar.gz
-Patch0:         dvgrab-3.3-fix-gcc-4.4-build.patch
-Patch1:         dvgrab-3.4-set-proper-retval-on-failure.patch
+Source:         http://downloads.sourceforge.net/project/kino/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libraw1394-devel libavc1394-devel libdv-devel
 BuildRequires:  libiec61883-devel libjpeg-devel
@@ -19,8 +17,6 @@ The dvgrab utility will capture digital video from a DV source on the firewire
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -40,6 +36,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/dvgrab.1*
 
 %changelog
+* Mon Jan 11 2010 Jay Fenlason <fenlason@redhat.com> 3.5-1
+- New upstream release, which obsoletes both patches.
+- Correct the Source url to point to sourceforge's current path.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index aab0a08..4f12da1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-093b74cb9f9bf321e48ffbbe5ba8cba6  dvgrab-3.4.tar.gz
+b39a242ce63e80fc347ab59931f75649  dvgrab-3.5.tar.gz