[packages/febootstrap] - updated to 3.20 - removed obsolete 0001-Fix-Python-code-when-_bestPackageFromList-returns-No patch

[qboosh]

commit dd4216e8a29f22c83be044e9a88b74cb12b19ef9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 27 19:20:05 2012 +0200

    - updated to 3.20
    - removed obsolete 0001-Fix-Python-code-when-_bestPackageFromList-returns-No patch
    - pl

 ...code-when-_bestPackageFromList-returns-No.patch | 27 ----------
 febootstrap.spec                                   | 61 +++++++++++++---------
 2 files changed, 37 insertions(+), 51 deletions(-)
---
diff --git a/febootstrap.spec b/febootstrap.spec
index cb2bad9..711f90b 100644
--- a/febootstrap.spec
+++ b/febootstrap.spec
@@ -1,38 +1,49 @@
 Summary:	Bootstrapping tool for creating supermin appliances
+Summary(pl.UTF-8):	Narzędzie bootstrapujące do tworzenia minimalistycznych instalacji
 Name:		febootstrap
-Version:	3.12
+Version:	3.20
 Release:	1
 License:	GPL v2
-Group:		Applications
-Source0:	http://people.redhat.com/~rjones/febootstrap/files/%{name}-%{version}.tar.gz
-# Source0-md5:	8d0143c96c538909bf0bbc13d09604c4
-Patch0:		0001-Fix-Python-code-when-_bestPackageFromList-returns-No.patch
+Group:		Applications/System
+Source0:	http://libguestfs.org/download/febootstrap/%{name}-%{version}.tar.gz
+# Source0-md5:	a3cc84a3beb1d095c9aebe9895aca532
 URL:		http://people.redhat.com/~rjones/febootstrap/
-BuildRequires:	ocaml >= 3.04-7
-BuildRequires:	ocaml-findlib
 BuildRequires:	e2fsprogs-devel
+BuildRequires:	gawk
 BuildRequires:	libcom_err-devel
+BuildRequires:	ocaml >= 3.04-7
+BuildRequires:	ocaml-findlib
+# not needed in releases (BTW: perldoc is checked, but pod2man is actually used)
+#BuildRequires:	perl-perldoc
+#BuildRequires:	perl-tools-pod
 BuildRequires:	zlib-devel
-BuildRequires:	perl-perldoc
-BuildRequires:	gawk
+Suggests:	filelight
+Suggests:	qemu
 Suggests:	yum >= 3.2
 Suggests:	yum-utils
-Suggests:	qemu
-Suggests:	filelight
 Requires:	%{name}-supermin-helper = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Febootstrap is a tool for building supermin appliances.
-These are tiny appliances [similar to virtual machines], usually
-around 100KB in size, which get fully instantiated on-the-fly
-in a fraction of a second when you need to boot one of them.
+Febootstrap is a tool for building supermin appliances. These are tiny
+appliances [similar to virtual machines], usually around 100KB in
+size, which get fully instantiated on-the-fly in a fraction of a
+second when you need to boot one of them.
 
-Currently we support Fedora and Debian.
-We hope to support many other distros in future. 
+Currently only Fedora and Debian are supported.
+
+%description -l pl.UTF-8
+Febootstrap to narzędzie do tworzenia minimalistycznych instalacji
+zwanych "appliance". Są to małe instalacje (podobne do maszyn
+wirtualnych), zwykle mające ok. 100kB, które można zainstalować w
+całości w locie w ciągu ułamku sekundy, kiedy zachodzi potrzeba
+uruchomienia takowej.
+
+Obecnie obsługiwane są tylko Fedora i Debian.
 
 %package supermin-helper
 Summary:	Runtime support for febootstrap
+Summary(pl.UTF-8):	Wsparcie uruchomieniowe dla narzędzia febootstrap
 Group:		Development/Tools
 Requires:	util-linux
 Requires:	cpio
@@ -41,19 +52,21 @@ Requires:	/sbin/mke2fs
 %description supermin-helper
 This package contains the runtime support for febootstrap.
 
+%description supermin-helper -l pl.UTF-8
+Ten pakiet zawiera wsparcie uruchomieniowe dla narzędzia febootstrap.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
-	YUM="yum" \
-	RPM="rpm" \
-	YUMDOWNLOADER="yumdownloader" \
-	APTITUDE="aptitude" \
 	APT_CACHE="apg-cache" \
+	APTITUDE="aptitude" \
 	DPKG="dpkg" \
-	PACMAN="pacman"
+	PACMAN="pacman" \
+	RPM="rpm" \
+	YUM="yum" \
+	YUMDOWNLOADER="yumdownloader"
 
 %{__make}
 
@@ -68,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README TODO
 %attr(755,root,root) %{_bindir}/febootstrap
 %{_mandir}/man8/febootstrap.8*
 
diff --git a/0001-Fix-Python-code-when-_bestPackageFromList-returns-No.patch b/0001-Fix-Python-code-when-_bestPackageFromList-returns-No.patch
deleted file mode 100644
index d88afd2..0000000
--- a/0001-Fix-Python-code-when-_bestPackageFromList-returns-No.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 61c565bc06a83da75b57f8568fe76f393e665d70 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Tue, 8 Nov 2011 14:40:18 +0000
-Subject: [PATCH] Fix Python code when _bestPackageFromList returns None.
-
-Yet Another Bug caused by lack of strong typing and nullable types in
-this sad excuse for a programming language.
----
- src/febootstrap_yum_rpm.ml |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/febootstrap_yum_rpm.ml b/src/febootstrap_yum_rpm.ml
-index bfda11e..1def619 100644
---- a/src/febootstrap_yum_rpm.ml
-+++ b/src/febootstrap_yum_rpm.ml
-@@ -78,7 +78,7 @@ while not stable:
-             for r in pkg.requires:
-                 ps = yb.whatProvides (r[0], r[1], r[2])
-                 best = yb._bestPackageFromList (ps.returnPackages ())
--                if best.name != pkg.name:
-+                if best and best.name != pkg.name:
-                     deps[pkg].append (best)
-                     if not deps.has_key (best):
-                         deps[best] = False
--- 
-1.7.6
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/febootstrap.git/commitdiff/dd4216e8a29f22c83be044e9a88b74cb12b19ef9