- updated to 1.22.4

[packages/libguestfs.git] / libguestfs.spec

diff --git a/libguestfs.spec b/libguestfs.spec
index 048d3955c0066130a287aa1cc4b7aecb99986096..9583a4a5ec565fa3ae38e2d9ee2e9d42a9275eb2 100644 (file)
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,16 +22,17 @@
 Summary:       Library and tools for accessing and modifying virtual machine disk images
 Summary(pl.UTF-8):     Biblioteka i narzędzia do dostępu i modyfikacji obrazów dysków maszyn wirtualnych
 Name:          libguestfs
-Version:       1.20.5
-Release:       2
+Version:       1.22.4
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://libguestfs.org/download/1.20-stable/%{name}-%{version}.tar.gz
-# Source0-md5: a3633aea4c5e21588e72a88019acd739
+Source0:       http://libguestfs.org/download/1.22-stable/%{name}-%{version}.tar.gz
+# Source0-md5: 8317fd78d47afb05d11200a3e747bef1
 Patch0:                ncurses.patch
 Patch1:                augeas-libxml2.patch
 Patch2:                %{name}-link.patch
 Patch3:                %{name}-am.patch
+Patch4:                %{name}-completionsdir.patch
 URL:           http://libguestfs.org/
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -365,7 +366,7 @@ Wiązania języka Ruby do libguestfs.
 Summary:       bash-completion for libguestfs tools
 Summary(pl.UTF-8):     Bashowe uzupełnianie argumentów dla narzędzi libguestfs
 Group:         Applications/Shells
-Requires:      bash-completion
+Requires:      bash-completion >= 2.0
 
 %description -n bash-completion-libguestfs
 bash-completion for guestfish tool.
@@ -379,6 +380,7 @@ Bashowe uzupełnianie argumentów dla narzędzi libguestfs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -395,6 +397,7 @@ Bashowe uzupełnianie argumentów dla narzędzi libguestfs.
        PAMCUT=/usr/bin/pamcut \
        WRESTOOL=/usr/bin/wrestool \
        QEMU=%{_bindir}/qemu \
+       --with-completionsdir=%{_datadir}/bash-completion/completions \
        --with-html-dir=%{_gtkdocdir} \
        --with-java=%{?with_java:%{java_home}}%{!?with_java:no} \
        --with-qemu=qemu \
@@ -504,6 +507,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/guestfish
 %attr(755,root,root) %{_bindir}/guestmount
+%attr(755,root,root) %{_bindir}/guestunmount
 %attr(755,root,root) %{_bindir}/libguestfs-test-tool
 %attr(755,root,root) %{_bindir}/virt-alignment-scan
 %attr(755,root,root) %{_bindir}/virt-cat
@@ -537,6 +541,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/guestfs-recipes.1*
 %{_mandir}/man1/guestfs-testing.1*
 %{_mandir}/man1/guestmount.1*
+%{_mandir}/man1/guestunmount.1*
 %{_mandir}/man1/libguestfs-make-fixed-appliance.1*
 %{_mandir}/man1/libguestfs-test-tool.1*
 %{_mandir}/man1/virt-alignment-scan.1*
@@ -559,6 +564,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_mandir}/ja/man1/guestfs-recipes.1*
 %lang(ja) %{_mandir}/ja/man1/guestfs-testing.1*
 %lang(ja) %{_mandir}/ja/man1/guestmount.1*
+%lang(ja) %{_mandir}/ja/man1/guestunmount.1*
 %lang(ja) %{_mandir}/ja/man1/libguestfs-make-fixed-appliance.1*
 %lang(ja) %{_mandir}/ja/man1/libguestfs-test-tool.1*
 %lang(ja) %{_mandir}/ja/man1/virt-alignment-scan.1*
@@ -580,6 +586,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(uk) %{_mandir}/uk/man1/guestfs-recipes.1*
 %lang(uk) %{_mandir}/uk/man1/guestfs-testing.1*
 %lang(uk) %{_mandir}/uk/man1/guestmount.1*
+%lang(uk) %{_mandir}/uk/man1/guestunmount.1*
 %lang(uk) %{_mandir}/uk/man1/libguestfs-make-fixed-appliance.1*
 %lang(uk) %{_mandir}/uk/man1/libguestfs-test-tool.1*
 %lang(uk) %{_mandir}/uk/man1/virt-alignment-scan.1*
@@ -632,6 +639,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(uk) %{_mandir}/uk/man1/virt-win-reg.1*
 %endif
 
+
 %if %{with erlang}
 %files -n erlang-libguestfs
 %defattr(644,root,root,755)
@@ -693,15 +701,12 @@ rm -rf $RPM_BUILD_ROOT
 %files -n perl-libguestfs
 %defattr(644,root,root,755)
 %{perl_vendorarch}/Sys/Guestfs.pm
-%dir %{perl_vendorarch}/Sys/Guestfs
-%{perl_vendorarch}/Sys/Guestfs/Lib.pm
 %{perl_vendorarch}/Sys/bindtests.pl
 %dir %{perl_vendorarch}/auto/Sys/Guestfs
 %{perl_vendorarch}/auto/Sys/Guestfs/Guestfs.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Sys/Guestfs/Guestfs.so
 %{_mandir}/man3/guestfs-perl.3*
 %{_mandir}/man3/Sys::Guestfs.3pm*
-%{_mandir}/man3/Sys::Guestfs::Lib.3pm*
 %lang(ja) %{_mandir}/ja/man3/guestfs-perl.3*
 %lang(uk) %{_mandir}/uk/man3/guestfs-perl.3*
 %endif
@@ -735,4 +740,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-libguestfs
 %defattr(644,root,root,755)
-%attr(755,root,root) /etc/bash_completion.d/guestfish-bash-completion.sh
+%{_datadir}/bash-completion/completions/guestfish
+%{_datadir}/bash-completion/completions/guestmount
+%{_datadir}/bash-completion/completions/virt-*