From 1a65a48c9b028a957682bf5ede5dd866e238ece5 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Fri, 14 Nov 2008 21:02:43 +0000
Subject: [PATCH] update to 2.1

---
 .cvsignore |  5 +----
 scrub.spec | 13 ++++++++-----
 sources    |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 272a039..16f4aa3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-scrub-1.6-1.tgz
-scrub-1.7.tar.bz2
-scrub-1.8.tar.bz2
-scrub-1.9.tar.bz2
+scrub-2.1.tar.bz2
diff --git a/scrub.spec b/scrub.spec
index 28dfa21..f807852 100644
--- a/scrub.spec
+++ b/scrub.spec
@@ -1,6 +1,6 @@
 Name:		scrub
-Version:	1.9
-Release:	3%{?dist}
+Version:	2.1
+Release:	1%{?dist}
 Summary:	Disk scrubbing program
 License:	GPLv2+
 Group:		System Environment/Base
@@ -21,12 +21,12 @@ the file system is full, then scrubbed as in 2).
 %setup -q
 
 %build
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m 755 scrub $RPM_BUILD_ROOT%{_bindir}/scrub
-install -D -m 644 scrub.1 $RPM_BUILD_ROOT%{_mandir}/man1/scrub.1
+make DESTDIR=$RPM_BUILD_ROOT install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/scrub.1*
 
 %changelog
+* Fri Nov 14 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.1-1
+- update to 2.1
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.9-3
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index d3b0f6f..3b323c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-597a9c55aa031f2650546becf24cb2b0  scrub-1.9.tar.bz2
+6a72e6c68c4dd5ada565bb4edb7b4101  scrub-2.1.tar.bz2