From 704a3f5fddcb01f8dca215ca33abd6cc537435115d3ae355d4bda17a4c3b4cd7 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 13 Sep 2012 18:07:18 +0000 Subject: [PATCH] - add Requires libguestfs0 to libguestfs-devel to fix rpmlint warning - fix rpmlint warnings about shlib-policy-missing-lib: move files from libguestfs to guestfs-tools rename libguestfs-guestfsd to guestfsd rename libguestfs-doc to guestfs-doc rename libguestfs-data to guestfs-data OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=93 --- libguestfs.changes | 14 +++++++++++ libguestfs.spec | 60 +++++++++++++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 17 deletions(-) diff --git a/libguestfs.changes b/libguestfs.changes index 5a2ea63..f22e234 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Sep 13 19:32:00 CEST 2012 - ohering@suse.de + +- add Requires libguestfs0 to libguestfs-devel to fix rpmlint warning + +------------------------------------------------------------------- +Thu Sep 13 18:35:08 CEST 2012 - ohering@suse.de + +- fix rpmlint warnings about shlib-policy-missing-lib: + move files from libguestfs to guestfs-tools + rename libguestfs-guestfsd to guestfsd + rename libguestfs-doc to guestfs-doc + rename libguestfs-data to guestfs-data + ------------------------------------------------------------------- Thu Sep 13 14:53:39 CEST 2012 - ohering@suse.de diff --git a/libguestfs.spec b/libguestfs.spec index 86707e7..14074c0 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -125,7 +125,7 @@ BuildRequires: rubygem-rake # Url: http://libguestfs.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Tools for accessing and modifying virtual machine disk images +Summary: Compatibility package for guestfs-tools License: LGPL-2.1 Group: System/Filesystems Version: 1.19.40 @@ -135,7 +135,7 @@ Patch100: 0001-force-virtio_blk-in-old-guest-kernel.patch Source0: %{name}-%{version}.tar.gz Source10: libguestfs.mkinitrd.boot.sh Source11: libguestfs.mkinitrd.setup.sh -Recommends: %{name}-data +Requires: guestfs-tools %description libguestfs is a set of tools for accessing and modifying virtual machine (VM) @@ -153,21 +153,44 @@ All this functionality is available through a convenient shell called guestfish, or use virt-rescue to get a rescue shell for fixing unbootable virtual machines. -%package guestfsd -Summary: Provides guestfsd for the appliance +%package -n guestfs-tools +Summary: Tools for accessing and modifying virtual machine disk images +Group: System/Filesystems +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} +Recommends: guestfs-data + +%description -n guestfs-tools +libguestfs is a set of tools for accessing and modifying virtual machine (VM) +disk images. You can use this for viewing and editing files inside guests, +scripting changes to VMs, monitoring disk used/free statistics, P2V, V2V, +performing partial backups, cloning VMs, and much else besides. + +libguestfs can access nearly any type of filesystem including: all known types +of Linux filesystem (ext2/3/4, XFS, btrfs etc), any Windows filesystem (VFAT +and NTFS), any Mac OS X and BSD filesystems, LVM2 volume management, MBR and +GPT disk partitions, raw disks, qcow2, VirtualBox VDI, VMWare VMDK, CD and DVD +ISOs, SD cards, and dozens more. libguestfs doesn't need root permissions. + +All this functionality is available through a convenient shell called +guestfish, or use virt-rescue to get a rescue shell for fixing unbootable +virtual machines. + +%package -n guestfsd +Summary: Provides a daemon for the libguestfs appliance Group: System/Filesystems -%description guestfsd -guestfsd runs within the appliance. It receives commands from the host +%description -n guestfsd +guestfsd runs within the libguestfs appliance. It receives commands from the host and performs the requested action by calling the helper binaries. This package is only required for building the appliance. -%package doc -Summary: Documentation for libguestfs +%package -n guestfs-doc +Summary: Documentation for guestfs Group: Documentation/Other -%description doc -Documentation for libguestfs. +%description -n guestfs-doc +Documentation for guestfs. libguestfs is a set of tools for accessing and modifying virtual machine (VM) disk images. You can use this for viewing and editing files inside guests, @@ -233,7 +256,7 @@ Group: System/Filesystems Allows Ruby scripts to directly use libguestfs. %endif -%package data +%package -n guestfs-data # kernel-default needs that %if %{?sles_version}0 > 0 BuildRequires: sles-release @@ -276,7 +299,7 @@ BuildRequires: zerofree Summary: Virtual machine needed for libguestfs Group: System/Filesystems -%description data +%description -n guestfs-data libguestfs needs for it's run virtual machine image. This package provides such an image. @@ -284,6 +307,7 @@ an image. %package devel Summary: Development files for libguestfs Group: Development/Libraries/Other +Requires: libguestfs0 = %{version} %description devel Development files for libguestfs. @@ -356,6 +380,7 @@ autoreconf -fi --help || : #sed -i '1 s@^.*@#!/bin/sh -x@' configure %configure \ + --docdir=%{_defaultdocdir}/guestfs-doc \ --enable-daemon \ --enable-install-daemon \ --with-qemu=$QEMU \ @@ -505,11 +530,12 @@ rm -rf $RPM_BUILD_ROOT %post -n libguestfs0 -p /sbin/ldconfig %postun -n libguestfs0 -p /sbin/ldconfig -%files doc +%files -n guestfs-doc %defattr(-,root,root) -%{_datadir}/doc/libguestfs +%doc inspector/*.xml +%doc inspector/*.rng -%files data +%files -n guestfs-data %defattr(-,root,root) %{_libdir}/guestfs @@ -565,11 +591,11 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/guestfs.h %{_mandir}/man3/* -%files guestfsd +%files -n guestfsd %defattr(-,root,root) %{_sbindir}/guestfsd -%files -f %{name}.lang +%files -n guestfs-tools -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING README %{_bindir}/*