diff --git a/.gitignore b/.gitignore index ffa0ac9..3c626f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /rots-0.2.1.gem +/rots-0.2.2.gem diff --git a/rubygem-rots.spec b/rubygem-rots.spec index 6ba722e..6add74d 100644 --- a/rubygem-rots.spec +++ b/rubygem-rots.spec @@ -1,12 +1,12 @@ %global gem_name rots -%global commitdate 20131106 -%global commit babb5559aae8914556da528147b6649b9c48f48c +%global commitdate 20160208 +%global commit 8c278ef4563b8a2f7bb8d45e0690046350387684 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: rubygem-%{gem_name} -Version: 0.2.1 -Release: 7.%{commitdate}git%{shortcommit}%{?dist} +Version: 0.2.2 +Release: 1.%{commitdate}git%{shortcommit}%{?dist} Summary: OpenID server for testing OpenID client implementations Group: Development/Languages License: MIT @@ -14,19 +14,23 @@ URL: https://github.com/roman/rots # To obtain this gem: # git clone git://github.com/roman/rots.git # cd rots -# git checkout babb5559aae8914556da528147b6649b9c48f48c +# git checkout 8c278ef4563b8a2f7bb8d45e0690046350387684 # gem build rots.gemspec -# mv rots-0.2.1.gem .. +# mv rots-0.2.2.gem .. Source0: %{gem_name}-%{version}.gem +%if 0%{?fc19} || 0%{?fc20} || 0%{?el7} Requires: ruby(release) Requires: ruby(rubygems) +%endif BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: rubygem(rspec) BuildRequires: rubygem(rack) BuildRequires: rubygem(ruby-openid) BuildArch: noarch +%if 0%{?el7} Provides: rubygem(%{gem_name}) = %{version} +%endif # The ruby(release) package already provides a usable Ruby interpreter. # Filter the extra /usr/bin/ruby requirement here. @@ -58,13 +62,13 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec # Fix shebang sed -i -e 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' bin/%{gem_name} -# Fix for RSpec1 -sed -i -e '/require "spec"/d' spec/spec_helper.rb - # Remove developer-only file. rm Rakefile sed -i "s|\"Rakefile\",||g" %{gem_name}.gemspec +# Remove dependency on bundler +sed -e "\|require 'bundler/setup'|d" -i spec/spec_helper.rb + %build # Create the gem as gem install only works on a gem file gem build %{gem_name}.gemspec @@ -106,6 +110,11 @@ popd %exclude %{gem_instdir}/spec %changelog +* Tue Feb 09 2016 Ken Dreyer - 0.2.2-1.20160208git8c278ef +- Update to latest upstream Git snapshot +- Update for latest Rubygem packaging guidelines (drop explicit + Requires/Provides) + * Thu Feb 04 2016 Fedora Release Engineering - 0.2.1-7.20131106gitbabb555 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index e52a71d..fcafef6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -270ffa55332e9a4060dc48224793878f rots-0.2.1.gem +c126b829369c7e97af9c9c4c5f1c81c6 rots-0.2.2.gem