rpms/debootstrap/F-12 debootstrap-1.0.19-devices.patch, NONE, 1.1 debootstrap-1.0.19-perms.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 debootstrap.spec, 1.9, 1.10 sources, 1.5, 1.6 debootstrap-1.0.10-perms.patch, 1.1, NONE debootstrap-1.0.7-arch.patch, 1.1, NONE debootstrap-1.0.7-devices.patch, 1.1, NONE

[Adam Goode]

Author: agoode

Update of /cvs/extras/rpms/debootstrap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16612

Modified Files:
	.cvsignore debootstrap.spec sources 
Added Files:
	debootstrap-1.0.19-devices.patch 
	debootstrap-1.0.19-perms.patch 
Removed Files:
	debootstrap-1.0.10-perms.patch debootstrap-1.0.7-arch.patch 
	debootstrap-1.0.7-devices.patch 
Log Message:
* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
- Make sure to create /dev/console in devices.tar.gz


debootstrap-1.0.19-devices.patch:
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE debootstrap-1.0.19-devices.patch ---
diff -ur debootstrap.orig/Makefile debootstrap/Makefile
--- debootstrap.orig/Makefile	2009-09-21 11:23:11.000000000 -0400
+++ debootstrap/Makefile	2009-09-30 15:01:01.899945579 -0400
@@ -40,6 +40,8 @@
 	mkdir -p dev
 	chown 0:0 dev
 	chmod 755 dev
-	(cd dev && $(MAKEDEV) std ptmx fd consoleonly)
+	$(MAKEDEV) -d dev std ptmx fd
+	$(MAKEDEV) -d dev -x console
+	mknod dev/console c 5 1
 	tar cf - dev | gzip -9 >devices.tar.gz
 	rm -rf dev

debootstrap-1.0.19-perms.patch:
 Makefile |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--- NEW FILE debootstrap-1.0.19-perms.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	15 Jul 2008 20:46:15 -0000	1.5
+++ .cvsignore	30 Sep 2009 19:21:09 -0000	1.6
@@ -1 +1 @@
-debootstrap_1.0.10.tar.gz
+debootstrap_1.0.19.tar.gz


Index: debootstrap.spec
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-12/debootstrap.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- debootstrap.spec	24 Jul 2009 20:07:01 -0000	1.9
+++ debootstrap.spec	30 Sep 2009 19:21:10 -0000	1.10
@@ -1,15 +1,14 @@
 Name:           debootstrap
-Version:        1.0.10
-Release:        3%{?dist}
+Version:        1.0.19
+Release:        2%{?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,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 1.0.19-2
+- Make sure to create /dev/console in devices.tar.gz
+
+* Wed Sep 30 2009 Adam Goode <adam at spicenitz.org> - 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 <rel-eng at lists.fedoraproject.org> - 1.0.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/debootstrap/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	15 Jul 2008 20:46:15 -0000	1.5
+++ sources	30 Sep 2009 19:21:10 -0000	1.6
@@ -1 +1 @@
-7e69840dd670af938fc13eea9e53e49f  debootstrap_1.0.10.tar.gz
+e82b5745ec9c25bbe15c4cf075af4999  debootstrap_1.0.19.tar.gz


--- debootstrap-1.0.10-perms.patch DELETED ---


--- debootstrap-1.0.7-arch.patch DELETED ---


--- debootstrap-1.0.7-devices.patch DELETED ---