From b6e6e42b6b634b3033f8575d5708b90f9f57e135 Mon Sep 17 00:00:00 2001
From: pertusus <pertusus@fedoraproject.org>
Date: Nov 18 2007 20:01:15 +0000
Subject: - keep timestamps

- use rpm macros instead of hardcoded paths

---

diff --git a/debootstrap-1.0.7-perms.patch b/debootstrap-1.0.7-perms.patch
index 5617574..826b152 100644
--- a/debootstrap-1.0.7-perms.patch
+++ b/debootstrap-1.0.7-perms.patch
@@ -8,9 +8,9 @@ diff -urp debootstrap.orig/Makefile debootstrap/Makefile
 -	install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
 -	install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
 -	install -o root -g root -m 0644 functions $(DSDIR)/
-+	install -m 0644 scripts/debian/* $(DSDIR)/scripts/
-+	install -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
-+	install -m 0644 functions $(DSDIR)/
++	install -p -m 0644 scripts/debian/* $(DSDIR)/scripts/
++	install -p -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
++	install -p -m 0644 functions $(DSDIR)/
  
          # no special script for etch anymore
  	ln -s sid $(DSDIR)/scripts/etch
diff --git a/debootstrap.spec b/debootstrap.spec
index 3e34220..d77899b 100644
--- a/debootstrap.spec
+++ b/debootstrap.spec
@@ -1,6 +1,6 @@
 Name:           debootstrap
 Version:        1.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bootstrap a basic Debian GNU/Linux system
 
 Group:          System Environment/Base
@@ -35,6 +35,9 @@ Debian GNU/Linux guest system.
 
 
 %build
+# in Makefile, path is hardcoded, modify it to take rpm macros into account
+sed -i -e 's;/usr/sbin;%{_sbindir};' Makefile
+
 # _smp_mflags would make no sense at all
 fakeroot make
 
@@ -44,9 +47,14 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/debootstrap/scripts/
 install -d $RPM_BUILD_ROOT%{_sbindir}
 install -d $RPM_BUILD_ROOT%{_mandir}/man8
-install -m 0644 debootstrap.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -p -m 0644 debootstrap.8 $RPM_BUILD_ROOT%{_mandir}/man8
 make install DESTDIR=$RPM_BUILD_ROOT \
-       VERSION="%{version}-%{release}"
+       VERSION="%{version}-%{release}" \
+       DSDIR=$RPM_BUILD_ROOT%{_datadir}/debootstrap
+# substitute the rpm macro path
+sed -i -e 's;/usr/share;%{_datadir};' $RPM_BUILD_ROOT%{_sbindir}/debootstrap
+# correct the debootstrap script timestamp
+touch -r debootstrap  $RPM_BUILD_ROOT%{_sbindir}/debootstrap
 
 
 %clean
@@ -62,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 18 2007 Patrice Dumas <pertusus@free.fr> 1.0.7-2
+- keep timestamps
+- use rpm macros instead of hardcoded paths
+
 * Sat Nov 17 2007 Lubomir Kundrak <lkundrak@redhat.com> 1.0.7-1
 - Version bump