[lrzip] 0.621 bump

[Petr Pisar]

commit c521d9647556f38637f684b370cd570ee4cea228
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Mar 12 09:46:24 2015 +0100

    0.621 bump

 .gitignore |  1 +
 lrzip.spec | 21 ++++++++++++++++++---
 sources    |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c47fc7c..c3c4931 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ lrzip-0.46.tar.bz2
 /lrzip-0.615.tar.bz2
 /lrzip-0.616.tar.bz2
 /lrzip-0.620.tar.bz2
+/lrzip-0.621.tar.bz2
diff --git a/lrzip.spec b/lrzip.spec
index add3c3e..d46620e 100644
--- a/lrzip.spec
+++ b/lrzip.spec
@@ -6,14 +6,15 @@
 
 # These utilities do not use the standalone library
 Name:           lrzip
-Version:        0.620
+Version:        0.621
 Release:        1%{?dist}
 Summary:        Compression program optimized for large files
 Group:          Applications/File
+# libzpaq:      MIT
 # lzma:         Public Domain
 # md5.{c,h}:    GPLv3+
 # other files:  GPLv2+
-License:        GPLv2+ and GPLv3+ and Public Domain
+License:        GPLv2+ and GPLv3+ and MIT and Public Domain
 URL:            http://ck.kolivas.org/apps/%{name}/
 Source0:        %{url}%{name}-%{version}.tar.bz2
 BuildRequires:  bzip2-devel
@@ -24,6 +25,8 @@ BuildRequires:  zlib-devel
 BuildRequires:  nasm
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# TODO: unbundle zpaq <http://mattmahoney.net/dc/zpaq.html>
+Provides:       bundled(zpaq)
 
 %description
 Long Range ZIP or Lzma RZIP
@@ -38,6 +41,7 @@ than bzip2). Decompression is always much faster than bzip2.
 %package libs
 Summary:        Long Range ZIP library
 Group:          System Environment/Libraries
+Provides:       bundled(zpaq)
 
 %description libs
 Dynamic library implementing Long Range ZIP or Lzma RZIP algorithm and archive
@@ -57,6 +61,7 @@ Files needed to develop application using Long Range ZIP library.
 Summary:        Static Long Range ZIP library
 Group:          Development/Libraries
 Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+Provides:       bundled(zpaq)
 
 %description static
 Static library implementing Long Range ZIP or Lzma RZIP algorithm and archive
@@ -73,6 +78,7 @@ done
 
 
 %global docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
+%global docdir_devel %{_docdir}/%{name}-devel%{!?_pkgdocdir:%-%{version}}
 %build
 %configure \
     --docdir='%{docdir}' --disable-doc \
@@ -85,6 +91,11 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm {} +
+# Install devel documentation here because %%doc and direct installation
+# cannot be used at the same same
+install -d $RPM_BUILD_ROOT%{docdir_devel}
+install -m 0644 -t $RPM_BUILD_ROOT%{docdir_devel} \
+    decompress_demo.c liblrzip_demo.c
 
 
 %post libs -p /sbin/ldconfig
@@ -103,7 +114,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm {} +
 %{_libdir}/lib%{name}.so.*
 
 %files devel
-%doc decompress_demo.c liblrzip_demo.c
+%{docdir_devel}
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/*
@@ -112,6 +123,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm {} +
 %{_libdir}/lib%{name}.a
 
 %changelog
+* Thu Mar 12 2015 Petr Pisar <ppisar at redhat.com> - 0.621-1
+- 0.621 bump
+- License declaration corrected to (GPLv2+ and GPLv3+ and MIT and Public Domain)
+
 * Tue Mar 03 2015 Petr Pisar <ppisar at redhat.com> - 0.620-1
 - 0.620 bump
 - License declaration corrected from (GPLv2+) to (GPLv2+ and GPLv3+ and Public
diff --git a/sources b/sources
index 6461ba8..7170d6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-285b84113537cc9d8161d6d62dae9516  lrzip-0.620.tar.bz2
+53a12cc4d19aa030d0ab7f0a21db2cfe  lrzip-0.621.tar.bz2