[rubygem-logging] Update to 1.6.1

[Bohuslav Kabrda]

commit a8867bde672c3bba373ed42bb59f4360c2f2a5b8
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Wed Nov 2 10:18:18 2011 +0100

    Update to 1.6.1

 .gitignore           |    1 +
 rubygem-logging.spec |   63 ++++++++++++++++++++++++++++++++++++++-----------
 sources              |    2 +-
 3 files changed, 51 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a987366..1dbbde2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /logging-1.4.3.gem
+/logging-1.6.1.gem
diff --git a/rubygem-logging.spec b/rubygem-logging.spec
index f555e37..dcc11b7 100644
--- a/rubygem-logging.spec
+++ b/rubygem-logging.spec
@@ -1,12 +1,12 @@
 # Generated from logging-1.4.3.gem by gem2rpm -*- rpm-spec -*-
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname logging
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname logging
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
 Summary: A flexible and extendable logging library for Ruby
 Name: rubygem-%{gemname}
-Version: 1.4.3
+Version: 1.6.1
 Release: 1%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
@@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(little-plugger) >= 1.1.2
 BuildRequires: rubygems
+BuildRequires: rubygem(little-plugger) >= 1.1.2
+BuildRequires: rubygem(flexmock) >= 0.9.0
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -25,30 +27,63 @@ design of Java's log4j library. It features a hierarchical logging system,
 custom level names, multiple output destinations per log event, custom
 formatting, and more.
 
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+This package contains documentation for %{name}.
+
 
 %prep
+%setup -q -c -T
+
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --force --rdoc %{SOURCE0}
 
 %build
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --rdoc %{SOURCE0}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
 
-%clean
-rm -rf %{buildroot}
+%check
+pushd .%{geminstdir}
+testrb test
+popd
 
 %files
-%defattr(-, root, root, -)
-%{gemdir}/gems/%{gemname}-%{version}/
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/History.txt
-%doc %{geminstdir}/README.rdoc
+%dir %{geminstdir}
+%{geminstdir}/data
+%{geminstdir}/lib
+# version.txt is needed for runtime
+%{geminstdir}/version.txt
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
+# contains licensing information
+%doc %{geminstdir}/README.rdoc
 
+%files doc
+%{geminstdir}/examples
+%{geminstdir}/test
+%{geminstdir}/Rakefile
+%doc %{gemdir}/doc/%{gemname}-%{version}
+%doc %{geminstdir}/History.txt
 
 %changelog
+* Wed Nov 02 2011 Bohuslav Kabrda <bkabrda at redhat.com> - 1.6.1-1
+- New version.
+- Removed unnecessary defattr macro in files section.
+- Removed unnecessary clean section.
+- Replaced define macros with more appropriate global.
+- Moved gem install to the prep section.
+- Added check section to run tests.
+- BuildRequires now contain rubygem(little-plugger) and rubygem(flexmock) due to running tests.
+- Introduced doc subpackage.
+
 * Wed Mar 16 2011 Chris Lalancette <clalance at redhat.com> - 1.4.3-1
 - Initial package
diff --git a/sources b/sources
index f8897ba..4f176f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0271c080963186cd4430dc5715018921  logging-1.4.3.gem
+e6069fb7f9a556216ed5a42466dba075  logging-1.6.1.gem