- updated to 1.22.3

- added completionsdir patch

diff --git a/libguestfs-completionsdir.patch b/libguestfs-completionsdir.patch
new file mode 100644 (file)
index 0000000..e86471a
--- /dev/null
+++ b/libguestfs-completionsdir.patch
@@ -0,0 +1,22 @@
+--- libguestfs-1.22.3/configure.ac.orig        2013-06-14 17:10:32.000000000 +0200
++++ libguestfs-1.22.3/configure.ac     2013-06-19 18:14:18.122926776 +0200
+@@ -1526,6 +1526,11 @@
+ ])
+ 
+ dnl Bash completion.
++AC_ARG_WITH([completionsdir], [AS_HELP_STRING([--with-completionsdir], [path to bash completion directory])], [
++    bash_completion=yes
++    BASH_COMPLETIONS_DIR=$withval
++    AC_SUBST([BASH_COMPLETIONS_DIR])
++],[
+ PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
+     bash_completion=yes
+     AC_MSG_CHECKING([for bash-completions directory])
+@@ -1536,6 +1541,7 @@
+     bash_completion=no
+     AC_MSG_WARN([bash-completion not installed])
+ ])
++])
+ AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
+ 
+ dnl Library versioning.

diff --git a/libguestfs.spec b/libguestfs.spec
index 616fa072ffe630d674788e14d1d17c4dc71a5e66..3ca596a3855b86f93227e50f4345a65c4d777f07 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.22.2
+Version:       1.22.3
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://libguestfs.org/download/1.22-stable/%{name}-%{version}.tar.gz
-# Source0-md5: cc95d9619a32586990a2dd43bb6b77ca
+# Source0-md5: d0f7d46b8c5f3ea7554bb1eb45a894e4
 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
@@ -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 \
@@ -434,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
+# obsolete utilities
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{ja,uk}/man1/virt-{list-filesystems,list-partitions,make-fs,tar,win-reg}.1
+
 %find_lang %{name}
 
 %clean
@@ -613,28 +619,6 @@ rm -rf $RPM_BUILD_ROOT
 %lang(uk) %{_mandir}/uk/man1/virt-sparsify.1*
 %lang(uk) %{_mandir}/uk/man1/virt-sysprep.1*
 %endif
-%if %{with perltools}
-%attr(755,root,root) %{_bindir}/virt-list-filesystems
-%attr(755,root,root) %{_bindir}/virt-list-partitions
-%attr(755,root,root) %{_bindir}/virt-make-fs
-%attr(755,root,root) %{_bindir}/virt-tar
-%attr(755,root,root) %{_bindir}/virt-win-reg
-%{_mandir}/man1/virt-list-filesystems.1*
-%{_mandir}/man1/virt-list-partitions.1*
-%{_mandir}/man1/virt-make-fs.1*
-%{_mandir}/man1/virt-tar.1*
-%{_mandir}/man1/virt-win-reg.1*
-%lang(ja) %{_mandir}/ja/man1/virt-list-filesystems.1*
-%lang(ja) %{_mandir}/ja/man1/virt-list-partitions.1*
-%lang(ja) %{_mandir}/ja/man1/virt-make-fs.1*
-%lang(ja) %{_mandir}/ja/man1/virt-tar.1*
-%lang(ja) %{_mandir}/ja/man1/virt-win-reg.1*
-%lang(uk) %{_mandir}/uk/man1/virt-list-filesystems.1*
-%lang(uk) %{_mandir}/uk/man1/virt-list-partitions.1*
-%lang(uk) %{_mandir}/uk/man1/virt-make-fs.1*
-%lang(uk) %{_mandir}/uk/man1/virt-tar.1*
-%lang(uk) %{_mandir}/uk/man1/virt-win-reg.1*
-%endif
 
 %if %{with erlang}
 %files -n erlang-libguestfs
@@ -736,4 +720,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-libguestfs
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/*
+%{_datadir}/bash-completion/completions/guestfish
+%{_datadir}/bash-completion/completions/guestmount
+%{_datadir}/bash-completion/completions/virt-*