From dad819f534254f548973f6e4d35a8d15b31e6892 Mon Sep 17 00:00:00 2001
From: Patrick Laughton <jima@fedoraproject.org>
Date: Apr 09 2007 14:45:39 +0000
Subject: - Figures, NOW I notice the new version

- Adapted/removed patches (most fixes moved upstream, thanks!)

---

diff --git a/.cvsignore b/.cvsignore
index 62c1134..2ae1848 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-aoetools-14.tar.gz
+aoetools-15.tar.gz
diff --git a/aoetools-flush.patch b/aoetools-flush.patch
deleted file mode 100644
index 9f405af..0000000
--- a/aoetools-flush.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aoetools-14/aoe-flush.in.orig	2007-02-06 14:52:38.000000000 -0600
-+++ aoetools-14/aoe-flush.in	2007-03-30 11:53:07.000000000 -0500
-@@ -10,7 +10,7 @@
- 	exit 1
- fi
- 
--if test $1 = "-a"; then
-+if test "$1" = "-a"; then
- 	spec=all
- fi
- 
diff --git a/aoetools-makefile.patch b/aoetools-makefile.patch
index 9e3915d..11ec32b 100644
--- a/aoetools-makefile.patch
+++ b/aoetools-makefile.patch
@@ -1,13 +1,8 @@
---- aoetools-14/Makefile.orig	2006-10-31 10:34:07.000000000 -0600
-+++ aoetools-14/Makefile	2007-03-30 12:03:31.000000000 -0500
-@@ -54,11 +54,11 @@
- 
- # DESTDIR was put in for Rob Holland to make gentoo packaging easier
- install : all
--	mkdir -p ${SBINDIR}
--	mkdir -p ${MANDIR}/man8
-+	mkdir -p ${DESTDIR}${SBINDIR}
-+	mkdir -p ${DESTDIR}${MANDIR}/man8
+--- aoetools-15/Makefile.orig	2007-02-26 10:16:29.000000000 -0600
++++ aoetools-15/Makefile	2007-04-09 09:27:55.000000000 -0500
+@@ -57,8 +57,8 @@
+ 	mkdir -p ${DESTDIR}${SBINDIR}
+ 	mkdir -p ${DESTDIR}${MANDIR}/man8
  	@for f in ${COMMANDS}; do \
 -	  sh -xc "install -m 700 $$f ${DESTDIR}${SBINDIR}/$$f" || break; \
 -	  sh -xc "install -m 664 $$f.8 ${DESTDIR}${MANDIR}/man8/$$f.8" || break; \
diff --git a/aoetools.spec b/aoetools.spec
index 374be69..bb1d0d7 100644
--- a/aoetools.spec
+++ b/aoetools.spec
@@ -1,6 +1,6 @@
 Name:           aoetools
-Version:        14
-Release:        3%{?dist}
+Version:        15
+Release:        1%{?dist}
 Summary:        ATA over Ethernet Tools
 
 Group:          System Environment/Base
@@ -8,7 +8,6 @@ License:        GPL
 URL:            http://sourceforge.net/projects/aoetools/
 Source0:        http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:         %{name}-makefile.patch
-Patch1:         %{name}-flush.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -19,7 +18,6 @@ systems with version 2.6 Linux kernels.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 
 %build
@@ -43,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 09 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 15-1
+- Figures, NOW I notice the new version
+- Adapted/removed patches (most fixes moved upstream, thanks!)
+
 * Mon Apr 09 2007 Patrick "Jima" Laughton <jima@beer.tclug.org> 14-3
 - Added devnodes.txt to %%doc
 - Importing into CVS
diff --git a/sources b/sources
index 2df5598..9b887b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-592f9f031796b4f0b90166a8cd5f9e30  aoetools-14.tar.gz
+02f0b0651f09f11fc8e34b9f3d969dec  aoetools-15.tar.gz