From ea620a2d852494c875fd4d1d1d60866ef916d80b Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 27 Dec 2007 17:37:40 +0000
Subject: [PATCH] Update to 1.40-11 in devel. Modified Files: .cvsignore
 Makefile fdupes-1.40-string.patch fdupes.spec     sources Added Files:
 fdupes-1.40-makefile.patch Removed Files:     fdupes-1.40-destdir.patch

---
 fdupes-1.40-destdir.patch => fdupes-1.40-makefile.patch | 6 +++---
 fdupes.spec                                             | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)
 rename fdupes-1.40-destdir.patch => fdupes-1.40-makefile.patch (80%)

diff --git a/fdupes-1.40-destdir.patch b/fdupes-1.40-makefile.patch
similarity index 80%
rename from fdupes-1.40-destdir.patch
rename to fdupes-1.40-makefile.patch
index f177bbd..af7370e 100644
--- a/fdupes-1.40-destdir.patch
+++ b/fdupes-1.40-makefile.patch
@@ -1,6 +1,6 @@
 diff -urNp fdupes-1.40.orig/Makefile fdupes-1.40/Makefile
 --- fdupes-1.40.orig/Makefile	2001-03-15 08:19:11.000000000 +0530
-+++ fdupes-1.40/Makefile	2007-11-25 20:34:21.000000000 +0530
++++ fdupes-1.40/Makefile	2007-12-27 22:49:29.000000000 +0530
 @@ -1,3 +1,5 @@
 +DESTDIR =
 +
@@ -13,8 +13,8 @@ diff -urNp fdupes-1.40.orig/Makefile fdupes-1.40/Makefile
  install: fdupes
 -	cp fdupes $(INSTALLDIR)
 -	cp fdupes.1 $(MANPAGEDIR)/man1
-+	cp fdupes $(DESTDIR)$(INSTALLDIR)
-+	cp fdupes.1 $(DESTDIR)$(MANPAGEDIR)/man1
++	cp -p fdupes $(DESTDIR)$(INSTALLDIR)
++	cp -p fdupes.1 $(DESTDIR)$(MANPAGEDIR)/man1
  
  tarball: clean
  	tar --directory=.. -c -z -v -f ../fdupes-$(VERSION).tar.gz fdupes-$(VERSION)
diff --git a/fdupes.spec b/fdupes.spec
index f11f76a..c1632e6 100644
--- a/fdupes.spec
+++ b/fdupes.spec
@@ -1,13 +1,13 @@
 Summary:	Finds duplicate files in a given set of directories
 Name:		fdupes
 Version:	1.40
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	MIT
 Group:		Applications/File
 URL:		http://netdial.caribe.net/~adrian2/fdupes.html
 Source0:	http://netdial.caribe.net/~adrian2/programs/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-destdir.patch
+Patch0:		%{name}-%{version}-makefile.patch
 Patch1:		%{name}-%{version}-string.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Dec 27 2007 Debarshi Ray <rishi@fedoraproject.org> - 1.40-11
+- Fixed Makefile to preserve timestamps using 'cp -p'.
+
 * Thu Nov 29 2007 Debarshi Ray <rishi@fedoraproject.org> - 1.40-10
 - Release bumped to overcome spurious build.