Add yum to the appliance to support installing packages.

[a-fedora-appliance.git] / a-fedora-appliance.spec.in

diff --git a/a-fedora-appliance.spec.in b/a-fedora-appliance.spec.in
index f03c1c1..3b8349a 100644 (file)
--- a/a-fedora-appliance.spec.in
+++ b/a-fedora-appliance.spec.in
@@ -29,17 +29,10 @@ Requires:       @PACKAGELIST@
 
 BuildRequires:  createrepo
 
-BuildRequires:  supermin >= 4.1.1
-Requires(post): supermin-helper >= 4.1.1
+BuildRequires:  supermin >= 5.1.6
 
 Requires:       qemu-kvm >= 0.12
 
-# Provide our own custom requires for the supermin appliance.
-Source1:        extra-find-requires.sh
-%global _use_internal_dependency_generator 0
-%global __find_provides %{_rpmconfigdir}/find-provides
-%global __find_requires %{SOURCE1} %{_rpmconfigdir}/find-requires
-
 
 %description
 This is a package that contains a Fedora appliance, otherwise known as
@@ -50,7 +43,7 @@ throwaway to test Fedora things.  Or you can use it as a test of your
 hypervisor or virtual machine management tools.
 
 Note: The appliance only contains command line tools (no X11 or office
-suites).  rpm and yum installation of packages is not supported.
+suites).  rpm and yum installation of packages is supported.
 
 %if 0%{?fedora} >= 1
 This package contains an appliance built for Fedora %{fedora}.
@@ -86,7 +79,7 @@ failovermethod=priority
 enabled=1
 gpgcheck=0
 EOF
-%define extra --with-yum-config=$(pwd)/yum.conf
+%define extra --with-packager-config=$(pwd)/yum.conf
 %endif
 
 %configure %{extra}
@@ -104,8 +97,7 @@ mkdir -p $RPM_BUILD_ROOT%{appliancedir}
 # XXX We should add an RPM trigger so that this gets rebuilt after any
 # dependent package install (recursively).
 
-%{_libexecdir}/build-a-fedora-appliance "%{supermindir}" \
-  "%{appliancedir}/kernel" "%{appliancedir}/initrd" "%{appliancedir}/root" && \
+%{_libexecdir}/build-a-fedora-appliance "%{supermindir}" "%{appliancedir}" && \
   echo "Fedora %{fedora} appliance built in %{appliancedir}"