diff --git a/debootstrap-1.0.10-perms.patch b/debootstrap-1.0.10-perms.patch new file mode 100644 index 0000000..0ddd929 --- /dev/null +++ b/debootstrap-1.0.10-perms.patch @@ -0,0 +1,29 @@ +diff -urp debootstrap.orig/Makefile debootstrap/Makefile +diff -up debootstrap/Makefile.perms debootstrap/Makefile +--- debootstrap/Makefile.perms 2008-07-15 22:52:00.000000000 +0200 ++++ debootstrap/Makefile 2008-07-15 22:52:00.000000000 +0200 +@@ -16,9 +16,9 @@ install: + mkdir -p $(DSDIR)/scripts + mkdir -p $(DESTDIR)/usr/sbin + +- 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)/ + + # no special script for etch anymore + ln -s sid $(DSDIR)/scripts/etch +@@ -29,10 +29,9 @@ install: + ln -s gutsy $(DSDIR)/scripts/intrepid + + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap +- chown root:root $(DESTDIR)/usr/sbin/debootstrap + chmod 0755 $(DESTDIR)/usr/sbin/debootstrap + +- install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ ++ install -m 0644 devices.tar.gz $(DSDIR)/ + + devices.tar.gz: + rm -rf dev diff --git a/debootstrap-1.0.8-perms.patch b/debootstrap-1.0.8-perms.patch deleted file mode 100644 index 701e7db..0000000 --- a/debootstrap-1.0.8-perms.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urp debootstrap.orig/Makefile debootstrap/Makefile ---- debootstrap.orig/Makefile 2008-02-22 17:47:52.000000000 +0100 -+++ debootstrap/Makefile 2008-02-22 17:51:02.000000000 +0100 -@@ -16,9 +16,9 @@ install: - mkdir -p $(DSDIR)/scripts - mkdir -p $(DESTDIR)/usr/sbin - -- 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)/ - - # no special script for etch anymore - ln -s sid $(DSDIR)/scripts/etch -@@ -28,10 +28,9 @@ install: - ln -s gutsy $(DSDIR)/scripts/hardy - - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap -- chown root:root $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap - -- install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ -+ install -m 0644 devices.tar.gz $(DSDIR)/ - - devices.tar.gz: - rm -rf dev diff --git a/debootstrap.spec b/debootstrap.spec index be31cf3..49fdadd 100644 --- a/debootstrap.spec +++ b/debootstrap.spec @@ -9,7 +9,7 @@ URL: http://code.erisian.com.au/Wiki/debootstrap Source0: http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz Patch0: debootstrap-1.0.7-arch.patch Patch1: debootstrap-1.0.7-devices.patch -Patch2: debootstrap-1.0.8-perms.patch +Patch2: debootstrap-1.0.10-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch