[scalpel] Bump to version 2.0

[rebus]

commit 6c5b3417228c0fb9c37eca3afa69016bb9a438d0
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sun Jul 3 20:25:49 2011 +0200

    Bump to version 2.0

 .gitignore             |    1 +
 scalpel-confpath.patch |   15 ---------------
 scalpel.spec           |   29 +++++++++++++----------------
 sources                |    2 +-
 4 files changed, 15 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f40c983..eac5593 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /scalpel-1.60.tar.gz
+/scalpel-2.0.tar.gz
diff --git a/scalpel.spec b/scalpel.spec
index 7313b04..94bd262 100644
--- a/scalpel.spec
+++ b/scalpel.spec
@@ -1,6 +1,6 @@
 Name:           scalpel
-Version:        1.60
-Release:        4%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Fast file carver working on disk images
 
 Group:          Applications/System
@@ -8,10 +8,8 @@ License:        GPLv2+
 URL:            http://www.digitalforensicssolutions.com/Scalpel/
 Source0:        http://www.digitalforensicssolutions.com/Scalpel/%{name}-%{version}.tar.gz
 
-#Patch to search for system wide configuration if conf is not in working directory
-#Sent to upstream on 20100824 - golden at digitalforensicssolutions.com
-Patch0:         %{name}-confpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  tre-devel
 
 %description
 Scalpel is a fast file carver that reads a database of header and footer
@@ -22,7 +20,7 @@ digital forensics investigation and file recovery.
 
 %prep
 %setup -q
-%patch0 -p 1 -b .0conf
+chmod -x gpl.txt README Changelog src/*.h src/*.c
 
 #Remove Windows binary files
 rm -f *.exe *.dll
@@ -39,19 +37,15 @@ sed -i -e "s/^#[ ]*$//;
 
 
 %build
-make %{?_smp_mflags} CC_OPTS="$RPM_OPT_FLAGS"
+%configure
+%{__make} %{?_smp_mflags} OPTS="%{optflags}"
 
 %install
 rm -rf %{buildroot}
 
-install -d %{buildroot}%{_bindir}
-install -m 755 %{name} %{buildroot}%{_bindir}/%{name}
-
-install -d %{buildroot}%{_mandir}/man1
-install -m 644 %{name}.1* %{buildroot}%{_mandir}/man1/
-
-install -d %{buildroot}%{_sysconfdir}
-install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}.conf
+make install  DESTDIR=%{buildroot}
+mkdir -p %{buildroot}/%{_sysconfdir}
+install -m 644 %{name}.conf %{buildroot}/%{_sysconfdir}/
 
 %clean
 rm -rf %{buildroot}
@@ -59,13 +53,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README gpl.txt changelog
+%doc README gpl.txt Changelog
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Sun Jul 03 2011 Michal Ambroz <rebus at, seznam.cz> 2.0-1
+- bump to new release 2.0-1
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.60-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index a72d859..8f248ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0ad1ae3f709bb42d30ba2dee992c3b0  scalpel-1.60.tar.gz
+b0da813bf34941e79209d7fafe86a6e6  scalpel-2.0.tar.gz