summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2009-04-16 17:44:47 +0100
committerRichard Jones <rjones@redhat.com>2009-04-16 17:44:47 +0100
commit5a6da98c943be987441673a590c151f15573b6cc (patch)
tree3687dbeab6a2e4ce595566a09d88cb0f6f770cd1
parent1e60354dc8fb306fa139ae744a596f4f5bcbd9a7 (diff)
downloadlibguestfs-5a6da98c943be987441673a590c151f15573b6cc.tar.gz
libguestfs-5a6da98c943be987441673a590c151f15573b6cc.tar.xz
libguestfs-5a6da98c943be987441673a590c151f15573b6cc.zip
Resync with proposed Fedora specfile.
-rw-r--r--libguestfs.spec.in28
1 files changed, 20 insertions, 8 deletions
diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 49cf47d1..fc70b017 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -1,6 +1,4 @@
-# @configure_input@
-
-#%global mirror http://hakodate/mirrors/fedora/10/Fedora/x86_64/os/
+@configure_input@
Summary: Access and modify virtual machine disk images
Name: libguestfs
@@ -19,6 +17,13 @@ BuildRequires: febootstrap >= 1.5
BuildRequires: augeas-devel >= 0.5.0
BuildRequires: readline-devel
BuildRequires: qemu >= 0.10-7
+BuildRequires: createrepo
+
+# Build requirements for the appliance:
+# (see 'make-initramfs.sh.in' in the source)
+BuildRequires: kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
+BuildRequires: MAKEDEV, net-tools, augeas-libs, file
+BuildRequires: module-init-tools, procps, strace, iputils
# These are only required if you want to build the bindings for
# different languages:
@@ -143,7 +148,6 @@ Requires: %{name} = %{version}-%{release}
%build
-#%configure --with-mirror=%{mirror}
%configure
# 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
@@ -186,9 +190,11 @@ find $RPM_BUILD_ROOT -name .packlist -delete
rm $RPM_BUILD_ROOT%{python_sitearch}/libguestfsmod.a
rm $RPM_BUILD_ROOT%{python_sitearch}/libguestfsmod.la
-mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
-mv $RPM_BUILD_ROOT%{python_sitearch}/guestfs.py* \
- $RPM_BUILD_ROOT%{python_sitelib}/
+if [ "$RPM_BUILD_ROOT%{python_sitearch}" != "$RPM_BUILD_ROOT%{python_sitelib}" ]; then
+ mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
+ mv $RPM_BUILD_ROOT%{python_sitearch}/guestfs.py* \
+ $RPM_BUILD_ROOT%{python_sitelib}/
+fi
%clean
@@ -261,5 +267,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Apr 4 2009 Richard Jones <rjones@redhat.com> - @VERSION@-1
+* Thu Apr 16 2009 Richard Jones <rjones@redhat.com> - @VERSION@-1
+- New upstream version @VERSION@.
+
+* Thu Apr 16 2009 Richard Jones <rjones@redhat.com> - 0.9.9-12
+- Multiple fixes to get it to scratch build in Koji.
+
+* Sat Apr 4 2009 Richard Jones <rjones@redhat.com> - 0.9.9-1
- Initial build.