[fdupes/f15] Pre for merge with master.

[Richard Shaw]

commit 7f65d67bb847eab77b216f33f4169939622ea67d
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Tue May 15 21:09:50 2012 -0500

    Pre for merge with master.

 fdupes.spec   |   60 ++++++++++++++++++++++++++++++--------------------------
 macros.fdupes |    4 +-
 2 files changed, 34 insertions(+), 30 deletions(-)
---
diff --git a/fdupes.spec b/fdupes.spec
index 6fa7ab5..175f53d 100644
--- a/fdupes.spec
+++ b/fdupes.spec
@@ -1,57 +1,61 @@
-Summary:	Finds duplicate files in a given set of directories
-Name:		fdupes
-Version:	1.50
-Release:	0.5.PR2%{?dist}
-License:	MIT
-Group:		Applications/File
-URL:		http://netdial.caribe.net/~adrian2/fdupes.html
-Source0:	http://netdial.caribe.net/~adrian2/programs/fdupes/beta/%{name}-%{version}-PR2.tar.gz
-Source1:	macros.fdupes
-Patch0:		%{name}-%{version}-destdir.patch
+Name:           fdupes
+Summary:        Finds duplicate files in a given set of directories
+Version:        1.50
+Release:        0.5.PR2%{?dist}
+License:        MIT
+Group:          Applications/File
+URL:            http://netdial.caribe.net/~adrian2/fdupes.html
+Source0:        http://netdial.caribe.net/~adrian2/programs/fdupes/beta/%{name}-%{version}-PR2.tar.gz
+Source1:        macros.fdupes
+
+Patch0:         %{name}-%{version}-destdir.patch
 # http://bugs.debian.org/213385
-Patch1:		%{name}-%{version}-compare-file.patch
+Patch1:         %{name}-%{version}-compare-file.patch
 # http://bugs.debian.org/447601
-Patch2:		%{name}-%{version}-lfs.patch
+Patch2:         %{name}-%{version}-lfs.patch
 # http://bugs.debian.org/353789
-Patch3:		%{name}-%{version}-typo.patch
+Patch3:         %{name}-%{version}-typo.patch
 
 
 %description
 FDUPES is a program for identifying duplicate files residing within specified
 directories.
 
+
 %prep
 %setup -q -n %{name}-%{version}-PR2
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1 -b .destdir
+%patch1 -p1 -b .cmp
+%patch2 -p1 -b .lfs
+%patch3 -p1 -b .typo
+
 
 %build
-make %{?_smp_mflags} COMPILER_OPTIONS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} COMPILER_OPTIONS="%{optflags}"
+
 
 %check
 ./%{name} testdir
 ./%{name} --omitfirst testdir
 ./%{name} --recurse testdir
 ./%{name} --size testdir
-# ... etc..
+
 
 %install
-make install INSTALL="%{__install} -p" BIN_DIR=%{_bindir} \
-  MAN_BASE_DIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT
+make install INSTALL="%{__install} -p" \
+             BIN_DIR=%{_bindir} \
+             MAN_BASE_DIR=%{_mandir} \
+             DESTDIR=%{buildroot}
+
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
 
 %files
-%{_sysconfdir}/rpm/macros.fdupes
-%doc CHANGES
-%doc CONTRIBUTORS
-%doc README
-%doc TODO
+%doc CHANGES CONTRIBUTORS README TODO
 %doc %{_mandir}/man1/%{name}.1*
 %{_bindir}/%{name}
+%{_sysconfdir}/rpm/macros.fdupes
 
 %changelog
 * Tue May 15 2012 Tom Callaway <spot at fedoraproject.org> - 1.50-0.5.PR2
diff --git a/macros.fdupes b/macros.fdupes
index cf0cb65..a847ac8 100644
--- a/macros.fdupes
+++ b/macros.fdupes
@@ -8,8 +8,8 @@
       _target="$_file"; \
     else \
       if test -z "$_file" ; then \
-        _target=""; \
-        continue ; \
+	_target=""; \
+	continue ; \
       fi ; \
       if test "$_symlinks" = 1; then \
         ln -sf "${_target#%{buildroot}}" "$_file"; \