[stow/f16] Update to 2.2.0

[Michel Alexandre Salim]

commit 6f54d36f00293277cb604c76bc2b9af87f229dd8
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Apr 22 09:28:32 2012 +0700

    Update to 2.2.0

 .gitignore |    2 +-
 sources    |    2 +-
 stow.spec  |   43 ++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 40 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 601abe2..2c0f1a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-stow-1.3.3.tar.gz
+/stow-2.2.0.tar.gz
diff --git a/sources b/sources
index 69bf636..9b2280e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59a078c7056dd9dd97fb707063b69d03  stow-1.3.3.tar.gz
+902564d502975f353d3b0514a21863b1  stow-2.2.0.tar.gz
diff --git a/stow.spec b/stow.spec
index 7273b7c..61c7e6a 100644
--- a/stow.spec
+++ b/stow.spec
@@ -1,6 +1,6 @@
 Name:         stow
-Version:      1.3.3
-Release:      9%{?dist}
+Version:      2.2.0
+Release:      1%{?dist}
 
 License:      GPLv2+
 Group:        Development/Tools
@@ -9,7 +9,12 @@ Summary:      Manage the installation of software packages from source
 Source:       http://ftp.gnu.org/gnu/stow/stow-%{version}.tar.gz
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:    noarch
-Requires(pre):   /sbin/install-info
+
+# Test dependencies
+BuildRequires:  perl(Test::More)
+BuildRequires:  perl(Test::Output)
+
+Requires(preun): /sbin/install-info
 Requires(post):  /sbin/install-info
 
 %description
@@ -19,11 +24,19 @@ example) while making them appear to be installed in the same place
 (/usr/local). Software to ease the keeping track of software built from
 source, making it easy to install, delete, move etc.
 
+%package doc
+Summary:    Documentation for Stow
+Group:      Documentation
+Requires:   %{name} = %{version}-%{release}
+
+%description doc
+This package contains the documentation for GNU Stow.
+
 %prep
 %setup -q
 
 %build
-%configure
+%configure --docdir=%{_datadir}/doc/stow-doc-%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -31,6 +44,13 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # Remove info database, will be generated at install-time by scriptlets
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+# Remove unnecessary documentation
+cd $RPM_BUILD_ROOT%{_datadir}/doc/stow-doc-%{version}/
+rm -f ChangeLog* README version.texi
+
+%check
+make check
+
 %post
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
@@ -45,12 +65,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING README AUTHORS INSTALL ChangeLog NEWS THANKS TODO
+%doc COPYING README AUTHORS ChangeLog NEWS THANKS TODO
 %doc %{_mandir}/man8/stow*
 %doc %{_infodir}/stow*
 %{_bindir}/*
+%{_datadir}/perl5/Stow.pm
+%{_datadir}/perl5/Stow/
+
+%files doc
+%defattr(-,root,root)
+%docdir %{_docdir}/stow-doc-%{version}
+%{_docdir}/stow-doc-%{version}/manual.pdf
+%{_docdir}/stow-doc-%{version}/manual-single.html
+%{_docdir}/stow-doc-%{version}/manual-split/
+
 
 %changelog
+* Sat Apr 21 2012 Michel Salim <salimma at fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild