[fdupes/f17: 2/2] Merge with master.

[Richard Shaw]

commit 0982724b5769e3cb10b46e2834c36be4158274a3
Merge: a8b6c2f 53558dd
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Tue May 15 21:06:55 2012 -0500

    Merge with master.

 fdupes.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc fdupes.spec
index 3ff13b3,6fa7ab5..175f53d
--- a/fdupes.spec
+++ b/fdupes.spec
@@@ -39,27 -35,27 +39,27 @@@ make %{?_smp_mflags} COMPILER_OPTIONS="
  ./%{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 Richard Shaw <hobbes1069 at gmail.com> - 1.50-0.5.PR2
- - Add RPM macro.
+ * Tue May 15 2012 Tom Callaway <spot at fedoraproject.org> - 1.50-0.5.PR2
+ - add rpm macro file
  
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.50-0.4.PR2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild