Remove external dependency generator. Use supermin RPM deps instead.
This commit is contained in:
parent
64c7795711
commit
30311c6b21
|
@ -1,30 +0,0 @@
|
||||||
#!/bin/bash -
|
|
||||||
# Additional custom requires for libguestfs package.
|
|
||||||
|
|
||||||
original_find_requires="$1"
|
|
||||||
shift
|
|
||||||
|
|
||||||
# Get the list of files.
|
|
||||||
files=`sed "s/['\"]/\\\&/g"`
|
|
||||||
|
|
||||||
# Use ordinary find-requires first.
|
|
||||||
echo $files | tr [:blank:] '\n' | $original_find_requires
|
|
||||||
|
|
||||||
# Is supermin.d/packages included in the list of files?
|
|
||||||
packages=`echo $files | tr [:blank:] '\n' | grep 'supermin\.d/packages$'`
|
|
||||||
|
|
||||||
if [ -z "$packages" ]; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate one 'Requires:' line for each package listed in packages.
|
|
||||||
cat $packages
|
|
||||||
|
|
||||||
# We need to add library dependencies required by guestfsd (which
|
|
||||||
# is in the appliance).
|
|
||||||
guestfsd=$RPM_BUILD_ROOT/usr/sbin/guestfsd
|
|
||||||
if [ ! -x $guestfsd ]; then
|
|
||||||
echo "$0: cannot find guestfsd" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo $guestfsd | $original_find_requires
|
|
|
@ -39,7 +39,7 @@ Patch2: 0002-v2v-test-harness-Fix-boot-loop-so-it-detects-disk-in.patch
|
||||||
BuildRequires: perl(Pod::Simple)
|
BuildRequires: perl(Pod::Simple)
|
||||||
BuildRequires: perl(Pod::Man)
|
BuildRequires: perl(Pod::Man)
|
||||||
BuildRequires: /usr/bin/pod2text
|
BuildRequires: /usr/bin/pod2text
|
||||||
BuildRequires: supermin >= 5.1.8-3
|
BuildRequires: supermin-devel >= 5.1.12-4
|
||||||
BuildRequires: hivex-devel >= 1.2.7-7
|
BuildRequires: hivex-devel >= 1.2.7-7
|
||||||
BuildRequires: perl(Win::Hivex)
|
BuildRequires: perl(Win::Hivex)
|
||||||
BuildRequires: perl(Win::Hivex::Regedit)
|
BuildRequires: perl(Win::Hivex::Regedit)
|
||||||
|
@ -143,7 +143,18 @@ BuildRequires: syslinux syslinux-extlinux
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# For building the appliance.
|
# For building the appliance.
|
||||||
Requires: supermin >= 5.1.8-3
|
Requires: supermin >= 5.1.12
|
||||||
|
|
||||||
|
# The daemon dependencies are not included automatically, because it
|
||||||
|
# is buried inside the appliance, so list them here.
|
||||||
|
Requires: augeas-libs
|
||||||
|
Requires: libacl
|
||||||
|
Requires: libcap
|
||||||
|
Requires: hivex
|
||||||
|
Requires: pcre
|
||||||
|
Requires: libselinux
|
||||||
|
Requires: systemd-libs
|
||||||
|
Requires: yajl
|
||||||
|
|
||||||
# For core inspection API.
|
# For core inspection API.
|
||||||
Requires: libdb-utils
|
Requires: libdb-utils
|
||||||
|
@ -170,12 +181,6 @@ Requires: selinux-policy >= 3.11.1-63
|
||||||
#Requires: uml_utilities
|
#Requires: uml_utilities
|
||||||
#%endif
|
#%endif
|
||||||
|
|
||||||
# Provide our own custom requires for the supermin appliance.
|
|
||||||
Source1: libguestfs-find-requires.sh
|
|
||||||
%global _use_internal_dependency_generator 0
|
|
||||||
%global __find_provides %{_rpmconfigdir}/find-provides
|
|
||||||
%global __find_requires %{SOURCE1} %{_rpmconfigdir}/find-requires
|
|
||||||
|
|
||||||
# libguestfs live service
|
# libguestfs live service
|
||||||
Source2: guestfsd.service
|
Source2: guestfsd.service
|
||||||
Source3: 99-guestfsd.rules
|
Source3: 99-guestfsd.rules
|
||||||
|
@ -270,7 +275,6 @@ for %{name}.
|
||||||
Summary: GFS2 support for %{name}
|
Summary: GFS2 support for %{name}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
Requires: gfs2-utils
|
|
||||||
|
|
||||||
%description gfs2
|
%description gfs2
|
||||||
This adds GFS2 support to %{name}. Install it if you want to process
|
This adds GFS2 support to %{name}. Install it if you want to process
|
||||||
|
@ -282,7 +286,6 @@ disk images containing GFS2.
|
||||||
Summary: HFS+ support for %{name}
|
Summary: HFS+ support for %{name}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
Requires: hfsplus-tools
|
|
||||||
|
|
||||||
%description hfsplus
|
%description hfsplus
|
||||||
This adds HFS+ support to %{name}. Install it if you want to process
|
This adds HFS+ support to %{name}. Install it if you want to process
|
||||||
|
@ -294,7 +297,6 @@ disk images containing HFS+ / Mac OS Extended filesystems.
|
||||||
Summary: JFS support for %{name}
|
Summary: JFS support for %{name}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
Requires: jfsutils
|
|
||||||
|
|
||||||
%description jfs
|
%description jfs
|
||||||
This adds JFS support to %{name}. Install it if you want to process
|
This adds JFS support to %{name}. Install it if you want to process
|
||||||
|
@ -305,7 +307,6 @@ disk images containing JFS.
|
||||||
Summary: NILFS support for %{name}
|
Summary: NILFS support for %{name}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
Requires: nilfs-utils
|
|
||||||
|
|
||||||
%description nilfs
|
%description nilfs
|
||||||
This adds NILFS v2 support to %{name}. Install it if you want to process
|
This adds NILFS v2 support to %{name}. Install it if you want to process
|
||||||
|
@ -316,44 +317,36 @@ disk images containing NILFS v2.
|
||||||
Summary: ReiserFS support for %{name}
|
Summary: ReiserFS support for %{name}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
Requires: reiserfs-utils
|
|
||||||
|
|
||||||
%description reiserfs
|
%description reiserfs
|
||||||
This adds ReiserFS support to %{name}. Install it if you want to process
|
This adds ReiserFS support to %{name}. Install it if you want to process
|
||||||
disk images containing ReiserFS.
|
disk images containing ReiserFS.
|
||||||
|
|
||||||
|
|
||||||
%package rsync
|
|
||||||
Summary: rsync support for %{name}
|
|
||||||
License: LGPLv2+
|
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
|
||||||
Requires: rsync
|
|
||||||
|
|
||||||
%description rsync
|
|
||||||
This adds rsync support to %{name}. Install it if you want to use
|
|
||||||
rsync to upload or download files into disk images.
|
|
||||||
|
|
||||||
|
|
||||||
%package rescue
|
%package rescue
|
||||||
Summary: Additional tools for virt-rescue
|
Summary: Additional tools for virt-rescue
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Requires: %{name}-tools-c = %{epoch}:%{version}-%{release}
|
Requires: %{name}-tools-c = %{epoch}:%{version}-%{release}
|
||||||
Requires: iputils
|
|
||||||
Requires: lsof
|
|
||||||
Requires: openssh-clients
|
|
||||||
Requires: strace
|
|
||||||
Requires: vim-minimal
|
|
||||||
|
|
||||||
%description rescue
|
%description rescue
|
||||||
This adds additional tools to use inside the virt-rescue shell,
|
This adds additional tools to use inside the virt-rescue shell,
|
||||||
such as ssh, network utilities, editors and debugging utilities.
|
such as ssh, network utilities, editors and debugging utilities.
|
||||||
|
|
||||||
|
|
||||||
|
%package rsync
|
||||||
|
Summary: rsync support for %{name}
|
||||||
|
License: LGPLv2+
|
||||||
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
|
%description rsync
|
||||||
|
This adds rsync support to %{name}. Install it if you want to use
|
||||||
|
rsync to upload or download files into disk images.
|
||||||
|
|
||||||
|
|
||||||
%package xfs
|
%package xfs
|
||||||
Summary: XFS support for %{name}
|
Summary: XFS support for %{name}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
Requires: xfsprogs
|
|
||||||
|
|
||||||
%description xfs
|
%description xfs
|
||||||
This adds XFS support to %{name}. Install it if you want to process
|
This adds XFS support to %{name}. Install it if you want to process
|
||||||
|
@ -365,7 +358,6 @@ disk images containing XFS.
|
||||||
Summary: ZFS support for %{name}
|
Summary: ZFS support for %{name}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
Requires: zfs-fuse
|
|
||||||
|
|
||||||
%description zfs
|
%description zfs
|
||||||
This adds ZFS support to %{name}. Install it if you want to process
|
This adds ZFS support to %{name}. Install it if you want to process
|
||||||
|
@ -1373,6 +1365,7 @@ popd
|
||||||
* Thu Mar 12 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.30-2
|
* Thu Mar 12 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.30-2
|
||||||
- Add virt-v2v-test-harness subpackage.
|
- Add virt-v2v-test-harness subpackage.
|
||||||
- Add a couple of upstream patches to fix the virt-v2v test harness.
|
- Add a couple of upstream patches to fix the virt-v2v test harness.
|
||||||
|
- Remove external dependency generator. Use supermin RPM deps instead.
|
||||||
|
|
||||||
* Wed Mar 11 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.30-1
|
* Wed Mar 11 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.30-1
|
||||||
- New upstream version 1.29.30.
|
- New upstream version 1.29.30.
|
||||||
|
|
Loading…
Reference in New Issue