New upstream version 5.1.0.

- Note this is effectively a rewrite, and is not completely compatible.
- There is no separate 'supermin-helper' subpackage any more.
- Requires rpm instead of yum.
This commit is contained in:
Richard W.M. Jones 2014-02-26 17:14:59 +00:00
parent eac0c44bf8
commit db0afa4609
2 changed files with 25 additions and 37 deletions

View File

@ -1 +1 @@
b8581450b92fd42d5fd26961bc21d2bc supermin-4.1.6.tar.gz 16033ada033af38bc9312d57906c7769 supermin-5.1.0.tar.gz

View File

@ -1,7 +1,7 @@
Summary: Tool for creating supermin appliances Summary: Tool for creating supermin appliances
Name: supermin Name: supermin
Version: 4.1.6 Version: 5.1.0
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
@ -12,22 +12,26 @@ URL: http://people.redhat.com/~rjones/supermin/
Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2man
BuildRequires: yum >= 3.2 BuildRequires: rpm
BuildRequires: /usr/sbin/mke2fs BuildRequires: /usr/sbin/mke2fs
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
BuildRequires: glibc-static, zlib-static BuildRequires: glibc-static, zlib-static
BuildRequires: ocaml, ocaml-findlib-devel BuildRequires: ocaml, ocaml-findlib-devel
BuildRequires: /usr/bin/execstack BuildRequires: /usr/bin/execstack
Requires: yum >= 3.2 Requires: rpm
Requires: yum-utils Requires: yum-utils
Requires: supermin-helper%{?_isa} = %{version}-%{release} Requires: util-linux-ng
Requires: cpio
Requires: /usr/sbin/mke2fs
# RHBZ#771310
Requires: e2fsprogs-libs >= 1.42
# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions # supermin-helper subpackage is no longer separate (since Fedora 21).
Provides: bundled(gnulib) # A single binary (supermin) provides both features.
# Remove this in Fedora 23.
# NB: Does NOT Provides, because this is not a compatible replacement. Provides: supermin-helper = %{version}-%{release}
Obsoletes: febootstrap < 3.21-3 Obsoletes: supermin-helper < 4.1.6-3
%description %description
@ -37,22 +41,6 @@ size, which get fully instantiated on-the-fly in a fraction of a
second when you need to boot one of them. second when you need to boot one of them.
%package helper
Summary: Runtime support for supermin
Requires: util-linux-ng
Requires: cpio
Requires: /usr/sbin/mke2fs
# RHBZ#771310
Requires: e2fsprogs-libs >= 1.42
# NB: Does NOT Provides, because this is not a compatible replacement.
Obsoletes: febootstrap-supermin-helper < 3.21-3
%description helper
%{name}-helper contains the runtime support for %{name}.
%prep %prep
%setup -q %setup -q
@ -65,12 +53,12 @@ make
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# supermin-helper is marked as requiring an executable stack. This # supermin is marked as requiring an executable stack. This happens
# happens because we use objcopy to create one of the component object # because we use objcopy to create one of the component object files
# files from a data file. The program does not in fact require an # from a data file. The program does not in fact require an
# executable stack. The easiest way to fix this is to clear the flag # executable stack. The easiest way to fix this is to clear the flag
# here. # here.
execstack -c $RPM_BUILD_ROOT%{_bindir}/supermin-helper execstack -c $RPM_BUILD_ROOT%{_bindir}/supermin
%check %check
@ -83,13 +71,13 @@ make check
%{_mandir}/man1/supermin.1* %{_mandir}/man1/supermin.1*
%files helper
%doc COPYING
%{_bindir}/supermin-helper
%{_mandir}/man1/supermin-helper.1*
%changelog %changelog
* Wed Feb 26 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.0-1
- New upstream version 5.1.0.
- Note this is effectively a rewrite, and is not completely compatible.
- There is no separate 'supermin-helper' subpackage any more.
- Requires rpm instead of yum.
* Mon Dec 23 2013 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-2 * Mon Dec 23 2013 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-2
- New upstream version 4.1.6. - New upstream version 4.1.6.
- Should fix all autotools brokenness. - Should fix all autotools brokenness.