From 658fab6fc6cd1481fde23fe1f2375769e4ef44b9 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 15 Feb 2018 11:08:47 +0100 Subject: [PATCH] Update to Mustermann 1.0.1. --- .gitignore | 3 +++ rubygem-mustermann.spec | 22 ++++++++++++++++------ sources | 6 +++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3d22a5c..48f3146 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /mustermann-1.0.0-mustermann-contrib.tgz /mustermann-1.0.0-support.tgz /mustermann-1.0.0.gem +/mustermann-1.0.1-mustermann-contrib.tgz +/mustermann-1.0.1-support.tgz +/mustermann-1.0.1.gem diff --git a/rubygem-mustermann.spec b/rubygem-mustermann.spec index 0199f58..6217f2c 100644 --- a/rubygem-mustermann.spec +++ b/rubygem-mustermann.spec @@ -5,18 +5,18 @@ %{?_with_bootstrap: %global bootstrap 1} Name: rubygem-%{gem_name} -Version: 1.0.0 -Release: 3%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Use patterns like regular expressions License: MIT URL: https://github.com/sinatra/mustermann Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Support and mustermann-contrib routines required by test suite. # git clone https://github.com/sinatra/mustermann.git && cd mustermann -# git checkout v1.0.0 && tar czvf mustermann-1.0.0-support.tgz support/ -Source1: mustermann-1.0.0-support.tgz -# tar czvf mustermann-1.0.0-mustermann-contrib.tgz mustermann-contrib/ -Source2: mustermann-1.0.0-mustermann-contrib.tgz +# git checkout v1.0.1 && tar czvf mustermann-1.0.1-support.tgz support/ +Source1: %{gem_name}-%{version}-support.tgz +# tar czvf mustermann-1.0.1-mustermann-contrib.tgz mustermann-contrib/ +Source2: %{gem_name}-%{version}-mustermann-contrib.tgz BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby >= 2.2.0 @@ -71,6 +71,13 @@ sed -i "/^require 'support\/coverage'/ s/^/#/" \ %{_builddir}/support/lib/support.rb pushd .%{gem_instdir} +# Mustermann extension is only available on Sinatra 1.x. +mv spec/extension_spec.rb{,.disabled} +sed -i "/^require 'mustermann\/extension'/ s/^/#/" \ + spec/mustermann_spec.rb +sed -i '/^ describe :extend_object do$/,/^ end$/ s/^/#/' \ + spec/mustermann_spec.rb + rspec -I%{_builddir}/{support,mustermann-contrib}/lib spec popd %endif @@ -90,6 +97,9 @@ popd %{gem_instdir}/spec %changelog +* Thu Feb 15 2018 Jun Aruga - 1.0.1-1 +- Update to Mustermann 1.0.1. + * Fri Feb 09 2018 Fedora Release Engineering - 1.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 966c138..dad00ea 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (mustermann-1.0.0-mustermann-contrib.tgz) = 6b560ea312c861ae4526733e96abf64dd2e42cdcb5babff46a384ea0712b8b8db7bfd0ed1d736670b32f35311afe8b18c095d25f3c3fb7b8977b94f5199e1082 -SHA512 (mustermann-1.0.0-support.tgz) = 5ac7bdc90ebff73e57b5f893b516a3249ff7802b9b2c29c9705360428a6741ef5410dd9791e1c8add181bb8dc32555de1cb3513235839541f19ea7e1f38546a8 -SHA512 (mustermann-1.0.0.gem) = eaccd4784373d03f9fabfa645e5c1272b29f5b2fb54942bf36d0f0cb033fdd50ac34ee2cf4c5928f20c6cf25d2a5fd9442ed56ebdce93ca8a3c9efff7014256b +SHA512 (mustermann-1.0.1-mustermann-contrib.tgz) = 16abd185b4c1a09765ec35c9693f0b849461e1ace99556d832764671b90840a20b7bd30ab6cd069019cf689389009af59bf8405ccee3822e91a4b9041b8400a6 +SHA512 (mustermann-1.0.1-support.tgz) = d0c308ede083d4af857fe122ddc754c492589848dc74c0c1cccfc8c0d9595d420f9ae327df4bdebd15448d7985eb8ce7a9dc3b282153be9e18dd36b3e6ea59e3 +SHA512 (mustermann-1.0.1.gem) = 6fbe0a0a2af41a4276283029ef3883e031080c7e1394e9a1e496c9de0dfbdd9dea3c753fc9fd64718f3d1d04ed61ea865165bab96e53c1b8b1258d91c5231562