rpms/fdupes/F-7 fdupes-1.40-makefile.patch, NONE, 1.1 fdupes.spec, 1.7, 1.8 fdupes-1.40-destdir.patch, 1.1, NONE

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/fdupes/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4710

Modified Files:
	fdupes.spec 
Added Files:
	fdupes-1.40-makefile.patch 
Removed Files:
	fdupes-1.40-destdir.patch 
Log Message:
Updated to 1.40-11 in F-7.
 
 Modified Files:
 	.cvsignore Makefile branch 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-makefile.patch:

--- NEW FILE fdupes-1.40-makefile.patch ---
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-12-27 22:49:29.000000000 +0530
@@ -1,3 +1,5 @@
+DESTDIR =
+
 #
 # INSTALLDIR indicates directory where program is to be installed. 
 # Suggested values are "/usr/local/bin" or "/usr/bin".
@@ -38,8 +40,8 @@ fdupes: fdupes.c md5/md5.c	
 	gcc fdupes.c md5/md5.c -Wall -o fdupes -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE)
 
 install: fdupes
-	cp fdupes $(INSTALLDIR)
-	cp fdupes.1 $(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)


Index: fdupes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fdupes/F-7/fdupes.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fdupes.spec	28 Nov 2007 19:59:23 -0000	1.7
+++ fdupes.spec	27 Dec 2007 17:45:19 -0000	1.8
@@ -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 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Dec 27 2007 Debarshi Ray <rishi at fedoraproject.org> - 1.40-11
+- Fixed Makefile to preserve timestamps using 'cp -p'.
+
 * Thu Nov 29 2007 Debarshi Ray <rishi at fedoraproject.org> - 1.40-10
 - Release bumped to overcome spurious build.
 


--- fdupes-1.40-destdir.patch DELETED ---