up to 2.1.2

diff --git a/ruby-net-sftp.spec b/ruby-net-sftp.spec
index 31d6db17c45ca06b8dd006598fbe32f0033c8621..80f23fe669c881a132e630829e06ef884102c73d 100644 (file)
--- a/ruby-net-sftp.spec
+++ b/ruby-net-sftp.spec
@@ -1,20 +1,29 @@
+#
+# Conditional build:
+%bcond_with    tests           # build without tests
+%bcond_without doc                     # don't build ri/rdoc
+
 %define pkgname net-sftp
 Summary:       Ruby SFTP library
 Summary(pl.UTF-8):     Biblioteka SFTP dla języka Ruby
 Name:          ruby-%{pkgname}
-Version:       2.0.2
+Version:       2.1.2
 Release:       1
-License:       GPL
+License:       MIT
 Group:         Development/Libraries
-Source0:       http://rubyforge.org/frs/download.php/51131/%{pkgname}-%{version}.tar.gz
-# Source0-md5: 2951825da7e2daed64c5db975ece2945
-URL:           http://net-ssh.rubyforge.org/
-BuildRequires: rpmbuild(macros) >= 1.277
+Source0:       http://rubygems.org/downloads/%{pkgname}-%{version}.gem
+# Source0-md5: c49f16fae9cea91123b06d903267205b
+URL:           https://github.com/net-ssh/net-sftp
+BuildRequires: rpm-rubyprov
+BuildRequires: rpmbuild(macros) >= 1.656
 BuildRequires: ruby-modules
-Requires:      ruby-net-ssh >= 2.0
-%{?ruby_mod_ver_requires_eq}
+%if %{with tests}
+BuildRequires: ruby-mocha
+BuildRequires: ruby-test-unit
+%endif
+Requires:      ruby-net-ssh >= 2.6.5
 Obsoletes:     ruby-Net-SFTP
-Provides:      ruby-Net-SFTP
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -25,32 +34,64 @@ Perform non-interactive SFTP processing, purely from Ruby!
 Net::SFTP ma się do SFTP tak, jak Net::FTP do FTP i Net::HTTP do HTTP.
 Umożliwia nieinteraktywne przetwarzanie SFTP w czystym Rubym.
 
+%package rdoc
+Summary:       HTML documentation for %{pkgname}
+Summary(pl.UTF-8):     Dokumentacja w formacie HTML dla %{pkgname}
+Group:         Documentation
+Requires:      ruby >= 1:1.8.7-4
+
+%description rdoc
+HTML documentation for %{pkgname}.
+
+%description rdoc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
+%package ri
+Summary:       ri documentation for %{pkgname}
+Summary(pl.UTF-8):     Dokumentacja w formacie ri dla %{pkgname}
+Group:         Documentation
+Requires:      ruby
+
+%description ri
+ri documentation for %{pkgname}.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla %{pkgname}.
+
 %prep
-%setup -q -n net-sftp-%{version}
+%setup -q -n %{pkgname}-%{version}
 
 %build
-ruby setup.rb config \
-       --site-ruby=%{ruby_rubylibdir} \
-       --so-dir=%{ruby_archdir}
-
-ruby setup.rb setup
 rdoc --inline-source --op rdoc lib
 rdoc --ri --op ri lib
+rm -r ri/Net/SSH
+rm -r ri/Net/cdesc-Net.ri
 rm ri/*.rid
+rm ri/cache.ri
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir}}
-
-ruby setup.rb install \
-       --prefix=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{ruby_vendorlibdir}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 
+install -d $RPM_BUILD_ROOT{%{ruby_ridir},%{ruby_rdocdir}/%{name}-%{version}}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a rdoc/* $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{ruby_rubylibdir}/*
+%{ruby_vendorlibdir}/net/sftp.rb
+%{ruby_vendorlibdir}/net/sftp
+
+%if %{with doc}
+%files rdoc
+%defattr(644,root,root,755)
+%{ruby_rdocdir}/%{name}-%{version}
+
+%files ri
+%defattr(644,root,root,755)
 %{ruby_ridir}/Net/SFTP
+%endif