rpms/debootstrap/F-8 debootstrap-1.0.7-perms.patch, 1.1, 1.2 debootstrap.spec, 1.1, 1.2

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/debootstrap/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30682

Modified Files:
	debootstrap-1.0.7-perms.patch debootstrap.spec 
Log Message:
* Sun Nov 18 2007 Patrice Dumas <pertusus at free.fr> 1.0.7-2
- keep timestamps
- use rpm macros instead of hardcoded paths


debootstrap-1.0.7-perms.patch:

Index: debootstrap-1.0.7-perms.patch
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-8/debootstrap-1.0.7-perms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- debootstrap-1.0.7-perms.patch	18 Nov 2007 19:12:16 -0000	1.1
+++ debootstrap-1.0.7-perms.patch	18 Nov 2007 20:06:56 -0000	1.2
@@ -8,9 +8,9 @@
 -	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


Index: debootstrap.spec
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-8/debootstrap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- debootstrap.spec	18 Nov 2007 19:12:16 -0000	1.1
+++ debootstrap.spec	18 Nov 2007 20:06:56 -0000	1.2
@@ -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 @@
 
 
 %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 @@
 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 @@
 
 
 %changelog
+* Sun Nov 18 2007 Patrice Dumas <pertusus at free.fr> 1.0.7-2
+- keep timestamps
+- use rpm macros instead of hardcoded paths
+
 * Sat Nov 17 2007 Lubomir Kundrak <lkundrak at redhat.com> 1.0.7-1
 - Version bump