Changes - j0ke.net Open Build Service

Changes of Revision 6

[-] [+]	Changed	debootstrap.spec
@@ -1,5 +1,5 @@ Name: debootstrap -Version: 0.3.3.1 +Version: 1.0.15 Release: 1 License: MIT style BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -8,7 +8,7 @@ Requires: binutils Group: System/Packages Source0: %{name}_%{version}.tar.gz -Patch0: debootstrap-no-root-install.diff +Patch0: %{name}-%{version}-no-root-install.diff # this was extracted from the debootstrap_.deb package as Debian # may expect other devices as SuSE's MAKEDEV generates... Source1: devices.tar.gz @@ -27,10 +27,10 @@ %prep -%setup -%patch -p1 +%setup -n %{name} +%patch -p0 #%ifarch %{ix86} -cp %{SOURCE1} devices-std.tar.gz +cp %{SOURCE1} devices.tar.gz #%else #echo "Please add devices-%{_arch}.tar.gz" #exit 1 @@ -42,7 +42,9 @@ cp debian/copyright debian/README.Debian . %install -make DESTDIR=$RPM_BUILD_ROOT install-allarch +make DESTDIR=$RPM_BUILD_ROOT install +%__install -D -m644 debootstrap.8 %{buildroot}%{_mandir}/man8/debootstrap.8 +gzip -9 %{buildroot}%{_mandir}/man8/debootstrap.8 %clean rm -rf "$RPM_BUILD_ROOT" @@ -50,10 +52,17 @@ %files %defattr(-,root,root) %doc debian-changelog README.Debian copyright -/usr/lib/debootstrap +%dir %{_datadir}/debootstrap +%dir %{_datadir}/debootstrap/scripts +%{_datadir}/debootstrap/functions +%{_datadir}/debootstrap/devices.tar.gz +%{_datadir}/debootstrap/scripts/ %{_mandir}/man8/debootstrap.8* %{_sbindir}/debootstrap %changelog +* Mon Aug 10 2009 Carsten Schoene <cs@linux-administrator.com> - 1.0.15-1 +- update to release 1.0.15 + * Tue Jan 16 2007 - gernot.hillier@siemens.com - first version of an RPM package
[-] [+]	Added	debootstrap-0.3.3.1-no-root-install.diff ^
@@ -0,0 +1,57 @@ +diff -ur debootstrap-0.3.3.1.orig/Makefile debootstrap-0.3.3.1/Makefile +--- debootstrap-0.3.3.1.orig/Makefile 2007-01-19 10:32:26.000000000 +0100 ++++ debootstrap-0.3.3.1/Makefile 2007-01-19 10:33:40.000000000 +0100 +@@ -24,34 +24,34 @@ + mkdir -p $(DSDIR)/scripts + mkdir -p $(DESTDIR)/usr/sbin + mkdir -p $(DESTDIR)/usr/share/man/man8 +- install -o root -g root -m 0644 potato $(DSDIR)/scripts/ +- install -o root -g root -m 0644 woody $(DSDIR)/scripts/ +- install -o root -g root -m 0644 woody.buildd $(DSDIR)/scripts/ +- install -o root -g root -m 0644 sarge $(DSDIR)/scripts/ +- install -o root -g root -m 0644 sarge.buildd $(DSDIR)/scripts/ +- install -o root -g root -m 0644 sarge.fakechroot $(DSDIR)/scripts/ +- install -o root -g root -m 0644 sid $(DSDIR)/scripts/ +- install -o root -g root -m 0644 warty $(DSDIR)/scripts/ +- install -o root -g root -m 0644 warty.buildd $(DSDIR)/scripts/ +- install -o root -g root -m 0644 hoary $(DSDIR)/scripts/ +- install -o root -g root -m 0644 hoary.buildd $(DSDIR)/scripts/ +- install -o root -g root -m 0644 breezy $(DSDIR)/scripts/ +- install -o root -g root -m 0644 functions $(DSDIR)/ ++ install -m 0644 potato $(DSDIR)/scripts/ ++ install -m 0644 woody $(DSDIR)/scripts/ ++ install -m 0644 woody.buildd $(DSDIR)/scripts/ ++ install -m 0644 sarge $(DSDIR)/scripts/ ++ install -m 0644 sarge.buildd $(DSDIR)/scripts/ ++ install -m 0644 sarge.fakechroot $(DSDIR)/scripts/ ++ install -m 0644 sid $(DSDIR)/scripts/ ++ install -m 0644 warty $(DSDIR)/scripts/ ++ install -m 0644 warty.buildd $(DSDIR)/scripts/ ++ install -m 0644 hoary $(DSDIR)/scripts/ ++ install -m 0644 hoary.buildd $(DSDIR)/scripts/ ++ install -m 0644 breezy $(DSDIR)/scripts/ ++ install -m 0644 functions $(DSDIR)/ + + # no special script for etch anymore + ln -s sid $(DSDIR)/scripts/etch + +- install -o root -g root -m 0755 debootstrap.8 $(DESTDIR)/usr/share/man/man8/ +- install -o root -g root -m 0755 debootstrap $(DESTDIR)/usr/sbin/ ++ install -m 0755 debootstrap.8 $(DESTDIR)/usr/share/man/man8/ ++ install -m 0755 debootstrap $(DESTDIR)/usr/sbin/ + + install-allarch: install +- install -o root -g root -m 0644 devices-std.tar.gz \ ++ install -m 0644 devices-std.tar.gz \ + $(DSDIR)/devices.tar.gz + + install-arch: install +- install -o root -g root -m 0755 pkgdetails $(DSDIR)/ +- install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ +- install -o root -g root -m 0644 debootstrap-arch $(DSDIR)/arch ++ install -m 0755 pkgdetails $(DSDIR)/ ++ install -m 0644 devices.tar.gz $(DSDIR)/ ++ install -m 0644 debootstrap-arch $(DSDIR)/arch + + pkgdetails: pkgdetails.o + $(CC) -o $@ $^
[-] [+]	Added	debootstrap-1.0.15-no-root-install.diff ^
@@ -0,0 +1,28 @@ +--- Makefile.orig 2009-04-24 14:51:54.000000000 +0200 ++++ Makefile 2009-08-10 13:54:54.000000000 +0200 +@@ -15,9 +15,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 +@@ -31,10 +31,10 @@ + ln -s gutsy $(DSDIR)/scripts/karmic + + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap +- chown root:root $(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
[-] [+]	Deleted	debootstrap-no-root-install.diff ^
@@ -1,57 +0,0 @@ -diff -ur debootstrap-0.3.3.1.orig/Makefile debootstrap-0.3.3.1/Makefile ---- debootstrap-0.3.3.1.orig/Makefile 2007-01-19 10:32:26.000000000 +0100 -+++ debootstrap-0.3.3.1/Makefile 2007-01-19 10:33:40.000000000 +0100 -@@ -24,34 +24,34 @@ - mkdir -p $(DSDIR)/scripts - mkdir -p $(DESTDIR)/usr/sbin - mkdir -p $(DESTDIR)/usr/share/man/man8 -- install -o root -g root -m 0644 potato $(DSDIR)/scripts/ -- install -o root -g root -m 0644 woody $(DSDIR)/scripts/ -- install -o root -g root -m 0644 woody.buildd $(DSDIR)/scripts/ -- install -o root -g root -m 0644 sarge $(DSDIR)/scripts/ -- install -o root -g root -m 0644 sarge.buildd $(DSDIR)/scripts/ -- install -o root -g root -m 0644 sarge.fakechroot $(DSDIR)/scripts/ -- install -o root -g root -m 0644 sid $(DSDIR)/scripts/ -- install -o root -g root -m 0644 warty $(DSDIR)/scripts/ -- install -o root -g root -m 0644 warty.buildd $(DSDIR)/scripts/ -- install -o root -g root -m 0644 hoary $(DSDIR)/scripts/ -- install -o root -g root -m 0644 hoary.buildd $(DSDIR)/scripts/ -- install -o root -g root -m 0644 breezy $(DSDIR)/scripts/ -- install -o root -g root -m 0644 functions $(DSDIR)/ -+ install -m 0644 potato $(DSDIR)/scripts/ -+ install -m 0644 woody $(DSDIR)/scripts/ -+ install -m 0644 woody.buildd $(DSDIR)/scripts/ -+ install -m 0644 sarge $(DSDIR)/scripts/ -+ install -m 0644 sarge.buildd $(DSDIR)/scripts/ -+ install -m 0644 sarge.fakechroot $(DSDIR)/scripts/ -+ install -m 0644 sid $(DSDIR)/scripts/ -+ install -m 0644 warty $(DSDIR)/scripts/ -+ install -m 0644 warty.buildd $(DSDIR)/scripts/ -+ install -m 0644 hoary $(DSDIR)/scripts/ -+ install -m 0644 hoary.buildd $(DSDIR)/scripts/ -+ install -m 0644 breezy $(DSDIR)/scripts/ -+ install -m 0644 functions $(DSDIR)/ - - # no special script for etch anymore - ln -s sid $(DSDIR)/scripts/etch - -- install -o root -g root -m 0755 debootstrap.8 $(DESTDIR)/usr/share/man/man8/ -- install -o root -g root -m 0755 debootstrap $(DESTDIR)/usr/sbin/ -+ install -m 0755 debootstrap.8 $(DESTDIR)/usr/share/man/man8/ -+ install -m 0755 debootstrap $(DESTDIR)/usr/sbin/ - - install-allarch: install -- install -o root -g root -m 0644 devices-std.tar.gz \ -+ install -m 0644 devices-std.tar.gz \ - $(DSDIR)/devices.tar.gz - - install-arch: install -- install -o root -g root -m 0755 pkgdetails $(DSDIR)/ -- install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ -- install -o root -g root -m 0644 debootstrap-arch $(DSDIR)/arch -+ install -m 0755 pkgdetails $(DSDIR)/ -+ install -m 0644 devices.tar.gz $(DSDIR)/ -+ install -m 0644 debootstrap-arch $(DSDIR)/arch - - pkgdetails: pkgdetails.o - $(CC) -o $@ $^
[-] [+]	Added	debootstrap_1.0.15.dsc ^
@@ -0,0 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +Format: 1.0 +Source: debootstrap +Binary: debootstrap, debootstrap-udeb +Architecture: all +Version: 1.0.15 +Maintainer: Debian Install System Team <debian-boot@lists.debian.org> +Uploaders: Anthony Towns <ajt@debian.org>, Joey Hess <joeyh@debian.org>, Frans Pop <fjp@debian.org>, Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org> +Standards-Version: 3.8.0 +Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/debootstrap +Build-Depends: debhelper (>= 4.2), makedev (>= 2.3.1-69) +Checksums-Sha1: + 9ea82faaf3a74d87c06d0e514369493feaa22f68 49783 debootstrap_1.0.15.tar.gz +Checksums-Sha256: + c8b370647481b8c4a66f95c93537686e79c006c2d088451d927ff18c811790c7 49783 debootstrap_1.0.15.tar.gz +Files: + 98ced313d1f8213bb2fc0f513947aad0 49783 debootstrap_1.0.15.tar.gz + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: Colin Watson <cjwatson@debian.org> -- Debian developer + +iD8DBQFKaIXZ9t0zAhD6TNERAjwxAJ9PYbZx4vUAh8UWxbFsz6XxKGGDNQCeOLWn +88UTAWbEj34d8qKXAVDC7FA= +=C9Cr +-----END PGP SIGNATURE-----
	Added	debootstrap_1.0.15.tar.gz ^