- up to 1.0.22

- news: support for lucid and (not tested) maverick

Changed files:
    debootstrap.spec -> 1.19

diff --git a/debootstrap.spec b/debootstrap.spec
index 33d6452b1f66cd28479049bc1bbba4aa0a1aa560..f4d4212f36b8af1da7ee36eafe7eb41abbfb398c 100644 (file)
--- a/debootstrap.spec
+++ b/debootstrap.spec
@@ -3,12 +3,12 @@
 Summary:       Bootstrap a basic Debian system
 Summary(pl.UTF-8):     Instalator podstawowego systemu opartego o pakiety deb
 Name:          debootstrap
-Version:       1.0.20
+Version:       1.0.22
 Release:       1
 License:       Freeware
 Group:         Applications/File
 Source0:       http://ftp.debian.org/debian/pool/main/d/debootstrap/%{name}_%{version}.tar.gz
-# Source0-md5: 8dee9524de8d757dacd56a57679f2e96
+# Source0-md5: d3fbb612b381841a616a804c946a344a
 Source1:       devices.tar.gz
 BuildRequires: sed >= 4.0
 Requires:      binutils
@@ -29,28 +29,21 @@ pliki .deb z serwera i ostrożnie rozpakowuje je do katalogu, dokąd
 możesz się następnie chrootować.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 sed -i -e "s|@VERSION@|%{version}|g" %{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_datadir}/%{name}/scripts}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_datadir}/%{name}}
 
 install %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 
-install scripts/debian/* $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
-install scripts/ubuntu/* $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
+cp -a scripts $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts
 
-ln -sf sid $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/etch
-ln -sf sid $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/etch-m68k
-ln -sf sid $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/lenny
-ln -sf sid $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/squeezy
-ln -sf gutsy $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/hardy
-ln -sf gutsy $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/intrepid
-ln -sf gutsy $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/jaunty
-ln -sf gutsy $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/karmic
+# not yet included in debootstrap package, but it should work
+ln -sf gutsy $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/maverick
 
 install functions $RPM_BUILD_ROOT%{_datadir}/%{name}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -60,7 +53,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc debian/README.Debian debian/copyright debian/changelog
+%doc README TODO debian/copyright debian/changelog
 %attr(755,root,root) %{_sbindir}/%{name}
 %{_mandir}/man8/%{name}.8*
 %dir %{_datadir}/%{name}