From 0f74a46f907d04ee903e50f177d3cca28fbd7f4f Mon Sep 17 00:00:00 2001 From: Adam Goode Date: Sep 30 2009 17:06:27 +0000 Subject: - New upstream release Many bugfixes Support for new distributions - Arch patch no longer needed - Rebase other patches --- diff --git a/.cvsignore b/.cvsignore index 441d750..49b646e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -debootstrap_1.0.10.tar.gz +debootstrap_1.0.19.tar.gz diff --git a/debootstrap-1.0.10-perms.patch b/debootstrap-1.0.10-perms.patch deleted file mode 100644 index 0ddd929..0000000 --- a/debootstrap-1.0.10-perms.patch +++ /dev/null @@ -1,29 +0,0 @@ -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.19-devices.patch b/debootstrap-1.0.19-devices.patch new file mode 100644 index 0000000..d8902d7 --- /dev/null +++ b/debootstrap-1.0.19-devices.patch @@ -0,0 +1,11 @@ +diff -ur debootstrap.orig/Makefile debootstrap/Makefile +--- debootstrap.orig/Makefile 2009-09-21 11:23:11.000000000 -0400 ++++ debootstrap/Makefile 2009-09-30 12:58:12.210944282 -0400 +@@ -40,6 +40,6 @@ + mkdir -p dev + chown 0:0 dev + chmod 755 dev +- (cd dev && $(MAKEDEV) std ptmx fd consoleonly) ++ $(MAKEDEV) -d dev std ptmx fd consoleonly + tar cf - dev | gzip -9 >devices.tar.gz + rm -rf dev diff --git a/debootstrap-1.0.19-perms.patch b/debootstrap-1.0.19-perms.patch new file mode 100644 index 0000000..e977197 --- /dev/null +++ b/debootstrap-1.0.19-perms.patch @@ -0,0 +1,28 @@ +diff -ur debootstrap.orig/Makefile debootstrap/Makefile +--- debootstrap.orig/Makefile 2009-09-21 11:23:11.000000000 -0400 ++++ debootstrap/Makefile 2009-09-30 13:01:27.151069252 -0400 +@@ -13,9 +13,9 @@ + 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 +@@ -30,10 +30,9 @@ + ln -s gutsy $(DSDIR)/scripts/lucid + + 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.7-arch.patch b/debootstrap-1.0.7-arch.patch deleted file mode 100644 index e457a28..0000000 --- a/debootstrap-1.0.7-arch.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urp debootstrap.orig/Makefile debootstrap/Makefile ---- debootstrap.orig/Makefile 2007-11-17 19:17:15.000000000 +0100 -+++ debootstrap/Makefile 2007-11-17 19:19:11.000000000 +0100 -@@ -1,7 +1,8 @@ - # avoid dpkg-dev dependency; fish out the version with sed - VERSION := $(shell sed 's/.*(\(.*\)).*/\1/; q' debian/changelog) - --ARCH := $(shell dpkg --print-architecture) -+# Not used at all -+#ARCH := $(shell dpkg --print-architecture) - - MAKEDEV := $(shell if [ -e /dev/MAKEDEV ]; then echo /dev/MAKEDEV; else echo /sbin/MAKEDEV; fi) - diff --git a/debootstrap-1.0.7-devices.patch b/debootstrap-1.0.7-devices.patch deleted file mode 100644 index 52819d3..0000000 --- a/debootstrap-1.0.7-devices.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urp debootstrap.orig/Makefile debootstrap/Makefile ---- debootstrap.orig/Makefile 2007-11-17 19:22:29.000000000 +0100 -+++ debootstrap/Makefile 2007-11-17 19:23:03.000000000 +0100 -@@ -35,6 +35,6 @@ devices.tar.gz: - mkdir -p dev - chown 0:0 dev - chmod 755 dev -- (cd dev && $(MAKEDEV) std ptmx fd) -+ $(MAKEDEV) -d dev std ptmx fd - tar cf - dev | gzip -9 >devices.tar.gz - rm -rf dev diff --git a/debootstrap.spec b/debootstrap.spec index 21619ff..39b873e 100644 --- a/debootstrap.spec +++ b/debootstrap.spec @@ -1,15 +1,14 @@ Name: debootstrap -Version: 1.0.10 -Release: 3%{?dist} +Version: 1.0.19 +Release: 1%{?dist} Summary: Debian GNU/Linux bootstrapper Group: System Environment/Base License: MIT 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.10-perms.patch +Patch0: debootstrap-1.0.19-devices.patch +Patch1: debootstrap-1.0.19-perms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -29,9 +28,8 @@ Debian GNU/Linux guest system. %prep %setup -q -n %{name} -%patch0 -p1 -b .arch -%patch1 -p1 -b .devices -%patch2 -p1 -b .perms +%patch0 -p1 -b .devices +%patch1 -p1 -b .perms %build @@ -70,6 +68,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 30 2009 Adam Goode - 1.0.19-1 +- New upstream release + + Many bugfixes + + Support for new distributions +- Arch patch no longer needed +- Rebase other patches + * Fri Jul 24 2009 Fedora Release Engineering - 1.0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index caa42e9..5e81151 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e69840dd670af938fc13eea9e53e49f debootstrap_1.0.10.tar.gz +e82b5745ec9c25bbe15c4cf075af4999 debootstrap_1.0.19.tar.gz