[supermin/f20] New upstream version 4.1.6. (This is the last version in the 4.x series.)

[Richard W.M. Jones]

commit b0177cc3d61039bab3e8fe085d56b826ebd7ccf3
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Mar 8 14:16:35 2014 +0000

    New upstream version 4.1.6.
    (This is the last version in the 4.x series.)
    
    - Man pages moved to section 1.
    - Remove upstream patch.
    - Add patch to give a clear error to people looking for supermin >= 5.

 ...rer-error-if-someone-tries-to-use-supermi.patch |   47 ++++++++++++++++++++
 ...t-crash-if-SUPERMIN_DTB-is-set-and-no-dtb.patch |   39 ----------------
 sources                                            |    2 +-
 supermin.spec                                      |   21 ++++++---
 4 files changed, 62 insertions(+), 47 deletions(-)
---
diff --git a/0001-Give-a-clearer-error-if-someone-tries-to-use-supermi.patch b/0001-Give-a-clearer-error-if-someone-tries-to-use-supermi.patch
new file mode 100644
index 0000000..a16f5b7
--- /dev/null
+++ b/0001-Give-a-clearer-error-if-someone-tries-to-use-supermi.patch
@@ -0,0 +1,47 @@
+From bb6be64ed041f7e7951035f7d9812766b3e3bf43 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Sat, 8 Mar 2014 14:09:51 +0000
+Subject: [PATCH] Give a clearer error if someone tries to use supermin 5
+ options.
+
+Users of supermin 4 need to upgrade when trying to compile
+libguestfs >= 1.26.  We identify these users because they try to run
+'supermin --prepare' or 'supermin --build'.
+---
+ src/supermin_cmdline.ml | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/src/supermin_cmdline.ml b/src/supermin_cmdline.ml
+index 435dc49..9dde6ab 100644
+--- a/src/supermin_cmdline.ml
++++ b/src/supermin_cmdline.ml
+@@ -54,6 +54,15 @@ let set_packager_config filename =
+ 
+   packager_config := Some filename
+ 
++let error_supermin_4 () =
++  eprintf "supermin: *** error: This is supermin version 4.\n";
++  eprintf "supermin: *** It looks like you are looking for supermin version >= 5.\n";
++  eprintf "\n";
++  eprintf "This version of supermin will not work.  You need to update to a\n";
++  eprintf "newer version.\n";
++  eprintf "\n";
++  exit 1
++
+ let argspec = Arg.align [
+   "--exclude", Arg.String add_exclude,
+     "regexp Exclude packages matching regexp";
+@@ -83,6 +92,10 @@ let argspec = Arg.align [
+     " Print package name and version, and exit";
+   "--yum-config", Arg.String set_packager_config,
+     "file Deprecated alias for `--packager-config file'";
++  "--build", Arg.Unit error_supermin_4,
++    " Give an error for people needing supermin 5";
++  "--prepare", Arg.Unit error_supermin_4,
++    " Give an error for people needing supermin 5";
+ ]
+ let anon_fn str =
+   packages := str :: !packages
+-- 
+1.8.5.3
+
diff --git a/sources b/sources
index 8cffccf..6b90df2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b24b7654e7942bed3bea3787bf76859  supermin-4.1.5.tar.gz
+b8581450b92fd42d5fd26961bc21d2bc  supermin-4.1.6.tar.gz
diff --git a/supermin.spec b/supermin.spec
index 746d8a9..904a0d1 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -1,7 +1,7 @@
 Summary:       Tool for creating supermin appliances
 Name:          supermin
-Version:       4.1.5
-Release:       2%{?dist}
+Version:       4.1.6
+Release:       1%{?dist}
 License:       GPLv2+
 
 %if 0%{?rhel} >= 7
@@ -11,9 +11,9 @@ ExclusiveArch: x86_64
 URL:           http://people.redhat.com/~rjones/supermin/
 Source0:       http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
 
-# (For ARM) Don't crash if SUPERMIN_DTB is set and --dtb not specified.
-# Upstream since 2013-09-08.
-Patch1:        0001-helper-Don-t-crash-if-SUPERMIN_DTB-is-set-and-no-dtb.patch
+# Upstream patch which gives a clearer error if someone is looking
+# for supermin 5, but uses this version (4) instead.
+Patch1:        0001-Give-a-clearer-error-if-someone-tries-to-use-supermi.patch
 
 BuildRequires: /usr/bin/pod2man
 BuildRequires: yum >= 3.2
@@ -91,16 +91,23 @@ make check
 %files
 %doc COPYING README examples/build-basic-vm.sh
 %{_bindir}/supermin
-%{_mandir}/man8/supermin.8*
+%{_mandir}/man1/supermin.1*
 
 
 %files helper
 %doc COPYING
 %{_bindir}/supermin-helper
-%{_mandir}/man8/supermin-helper.8*
+%{_mandir}/man1/supermin-helper.1*
 
 
 %changelog
+* Sat Mar  8 2014 Richard W.M. Jones <rjones at redhat.com> - 4.1.6-1
+- New upstream version 4.1.6.
+  (This is the last version in the 4.x series.)
+- Man pages moved to section 1.
+- Remove upstream patch.
+- Add patch to give a clear error to people looking for supermin >= 5.
+
 * Sun Sep  8 2013 Richard W.M. Jones <rjones at redhat.com> - 4.1.5-2
 - (For ARM) Don't crash if SUPERMIN_DTB is set and --dtb not specified.