[blktap] Update to 3.0.0(0.9.2 in git tag)

Wed Jul 9 15:01:01 UTC 2014

commit 62ee4782c8a14341e517956f8e07b59c6b221e69
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jul 9 23:00:44 2014 +0800

    Update to 3.0.0(0.9.2 in git tag)

 .gitignore  |    1 +
 blktap.spec |  124 ++++++++++++++++++++++++++++++++++++-----------------------
 sources     |    2 +-
 3 files changed, 78 insertions(+), 49 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e43ca37..8d57dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xen-org-blktap-62de80d.tar.gz
+/blktap-0.9.2.tar.gz
diff --git a/blktap.spec b/blktap.spec
index 2e2b0a6..b18b29c 100644
--- a/blktap.spec
+++ b/blktap.spec
@@ -1,60 +1,83 @@
-Name: blktap
-Summary: blktap user space utilities
-Version: 2.0.90
-Release: 9.git20111216.62de90d%{?dist}
-License: BSD and LGPLv2+
-Group: System Environment/Libraries
-URL: http://xen.org
-Source0: xen-org-blktap-62de80d.tar.gz
-#this is downloaded from https://github.com/xen-org/blktap
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: e2fsprogs-devel, xen-devel
-BuildRequires: libuuid-devel, libaio-devel
-BuildRequires: automake, autoconf, libtool
+Name:           blktap
+# https://github.com/xapi-project/blktap/issues/100
+# https://raw.githubusercontent.com/xapi-project/blktap/master/VERSION
+Version:        3.0.0
+Release:        1%{?dist}.git0.9.2
+Summary:        Blktap Userspace Tools + Library
+License:        BSD and LGPLv2+
+URL:            http://wiki.xen.org/wiki/Blktap
+Source0:        https://github.com/xapi-project/blktap/archive/%{version}.tar.gz#/%{name}-0.9.2.tar.gz
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  libaio-devel
+BuildRequires:  libtool
+BuildRequires:  libuuid-devel
+BuildRequires:  xen-devel
 # only Xen arches
-ExclusiveArch: %{ix86} x86_64 ia64
+ExclusiveArch:  %{ix86} x86_64 ia64
 
 %description
-This package contains the blktap userspace utilities
+The blktap userspace toolkit provides a user-level disk I/O
+interface. The blktap mechanism involves a kernel driver that acts
+similarly to the existing Xen/Linux blkback driver, and a set of
+associated user-level libraries.  Using these tools, blktap allows
+virtual block devices presented to VMs to be implemented in userspace
+and to be backed by raw partitions, files, network, etc.
 
-%package devel
-Summary: BlkTap Development Headers and Libraries
-Requires: blktap = %{version}
-Group: Development/Libraries
+The key benefit of blktap is that it makes it easy and fast to write
+arbitrary block backends, and that these user-level backends actually
+perform very well.  Specifically:
 
-%description devel
-This package contains the blktap development libraries and header files.
+- Metadata disk formats such as Copy-on-Write, encrypted disks, sparse
+  formats and other compression features can be easily implemented.
 
-%prep
-%setup -qn xen-org-blktap-62de80d
+- Accessing file-based images from userspace avoids problems related
+  to flushing dirty pages which are present in the Linux loopback
+  driver.  (Specifically, doing a large number of writes to an
+  NFS-backed image don't result in the OOM killer going berserk.)
 
-./autogen.sh
+- Per-disk handler processes enable easier userspace policing of block
+  resources, and process-granularity QoS techniques (disk scheduling
+  and related tools) may be trivially applied to block devices.
 
-%configure --disable-static
+- It's very easy to take advantage of userspace facilities such as
+  networking libraries, compression utilities, peer-to-peer
+  file-sharing systems and so on to build more complex block backends.
+
+- Crashes are contained -- incremental development/debugging is very
+  fast.
+
+The tools mainly help to verify and correct disk corruptions.
+
+%package        devel
+Summary:        Development files for %{name}
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description    devel
+This package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -qn %{name}-0.9.2
 
 %build
-%{__make} USE_SYSTEM_LIBRARIES=y
-find 
+./autogen.sh
+%configure --disable-static
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__make} install USE_SYSTEM_LIBRARIES=y DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} SBINDIR=%{_sbindir} SYSCONFDIR=%{_sysconfdir} -Wno-format
-
-#removing .la file
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libblktapctl.la
-%clean
-rm -rf $RPM_BUILD_ROOT
+%make_install
+find %{buildroot} -name '*.la' -delete -print
+rm -f %{buildroot}%{_sysconfdir}/logrotate.d/blktap
+rm -f %{buildroot}%{_sysconfdir}/cron.daily/blktap-log-cleanup
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%doc README
-%{_libdir}/libvhd.so*
-%{_libdir}/libvhdio.so*
-%{_libdir}/libblktapctl.so*
+%doc CONTRIB LICENSE MAINTAINERS README*
 %{_bindir}/vhd-*
 %{_sbindir}/lvm-util
 %{_sbindir}/part-util
@@ -62,16 +85,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/td-rated
 %{_sbindir}/td-util
 %{_sbindir}/vhdpartx
+%{_libdir}/libvhd.so.*
+%{_libdir}/libvhdio-2.0.90.so
+%{_libdir}/libblktapctl.so.*
 %{_libexecdir}/tapdisk
 %{_sysconfdir}/udev/rules.d/blktap.rules
 
 %files devel
-%defattr(-,root,root,-)
-%{_includedir}/blktap/*
-%{_includedir}/vhd/*
-%{_libdir}/libvhd*
+%{_includedir}/blktap/
+%{_includedir}/vhd/
+%{_libdir}/libblktapctl.so
+%{_libdir}/libvhd.so
+%{_libdir}/libvhdio.so
 
 %changelog
+* Fri Jul 04 2014 Christopher Meng <rpm at cicku.me> - 3.0.0-1.git0.9.2
+- Update to 3.0.0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.90-9.git20111216.62de90d
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -90,14 +120,12 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.90-4.git20111216.62de90d
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Fri Jan 11 2012 David Nalley <david at gnsa.us> 2.0.90-3.git20111216.62de90d
+* Wed Jan 11 2012 David Nalley <david at gnsa.us> 2.0.90-3.git20111216.62de90d
 - added a doc
 - removed .la file
+
 * Sat Dec 24 2011 David Nalley <david at gnsa.us> 2.0.90-2.git20111216.62de90d
 - fixed license section
+
 * Fri Dec 16 2011 David Nalley <david at gnsa.us> 2.0.90-1.git20111216.62de90d
 - Initial Fedora packaging efforts
-
-* Wed May 18 2011 xen.org <www.xen.org> [1.1.0 569]
-- Build blktap.
-
diff --git a/sources b/sources
index eb6d3e0..4414c2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df439833a726a8df06391d5cb5ba4ea6  xen-org-blktap-62de80d.tar.gz
+b3f4aebd6f4aee262ae3cc02bab9179d  blktap-0.9.2.tar.gz
