git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added some ideas in TODO file.
[libguestfs.git]
/
libguestfs.spec.in
diff --git
a/libguestfs.spec.in
b/libguestfs.spec.in
index
bc611ef
..
99a7798
100644
(file)
--- a/
libguestfs.spec.in
+++ b/
libguestfs.spec.in
@@
-1,6
+1,6
@@
# @configure_input@
# @configure_input@
-%global mirror http://hakodate/mirrors/fedora/10/Fedora/x86_64/os/
+
#
%global mirror http://hakodate/mirrors/fedora/10/Fedora/x86_64/os/
Summary: Access and modify virtual machine disk images
Name: libguestfs
Summary: Access and modify virtual machine disk images
Name: libguestfs
@@
-15,7
+15,8
@@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
# Basic build requirements:
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2text
-BuildRequires: febootstrap
+BuildRequires: febootstrap >= 1.5
+BuildRequires: augeas-devel
# If you want to build the bindings for different languages:
BuildRequires: ocaml
# If you want to build the bindings for different languages:
BuildRequires: ocaml
@@
-129,13
+130,18
@@
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)
%build
%build
-%configure --with-mirror=%{mirror}
+#%configure --with-mirror=%{mirror}
+%configure
# 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
# not the site dir.
make INSTALLDIRS=vendor
# 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
# not the site dir.
make INSTALLDIRS=vendor
+%check
+make check
+
+
%install
rm -rf $RPM_BUILD_ROOT
%install
rm -rf $RPM_BUILD_ROOT
@@
-145,14
+151,18
@@
rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la
# Clean up the examples/ directory which will get installed in %doc.
rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la
# Clean up the examples/ directory which will get installed in %doc.
-pushd examples
+# Note we can't delete the original examples/Makefile because that
+# will be needed by the check section later in the RPM build.
+cp -a examples ex
+pushd ex
make clean
rm Makefile*
rm -rf .deps .libs
popd
# Same for ocaml/examples.
make clean
rm Makefile*
rm -rf .deps .libs
popd
# Same for ocaml/examples.
-pushd ocaml/examples
+cp -a ocaml/examples ocaml/ex
+pushd ocaml/ex
make clean
rm Makefile*
popd
make clean
rm Makefile*
popd
@@
-179,7
+189,7
@@
rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%files devel
%defattr(-,root,root,-)
-%doc HACKING README ex
ample
s
+%doc HACKING README ex
html/guestfs.3.html html/pod.cs
s
%{_libdir}/libguestfs.so
%{_mandir}/man3/guestfs.3*
%{_includedir}/guestfs.h
%{_libdir}/libguestfs.so
%{_mandir}/man3/guestfs.3*
%{_includedir}/guestfs.h
@@
-189,6
+199,7
@@
rm -rf $RPM_BUILD_ROOT
%files -n guestfish
%defattr(-,root,root,-)
%files -n guestfish
%defattr(-,root,root,-)
+%doc html/guestfish.1.html html/pod.css
%{_bindir}/guestfish
%{_mandir}/man1/guestfish.1*
%{_bindir}/guestfish
%{_mandir}/man1/guestfish.1*
@@
-206,7
+217,7
@@
rm -rf $RPM_BUILD_ROOT
%files ocaml-devel
%defattr(-,root,root,-)
%files ocaml-devel
%defattr(-,root,root,-)
-%doc ocaml/ex
amples
+%doc ocaml/ex
%{_libdir}/ocaml/guestfs/*.a
%{_libdir}/ocaml/guestfs/*.cmxa
%{_libdir}/ocaml/guestfs/*.cmx
%{_libdir}/ocaml/guestfs/*.a
%{_libdir}/ocaml/guestfs/*.cmxa
%{_libdir}/ocaml/guestfs/*.cmx