ktdreyer pushed to rubygem-escape_utils (master). "Update to escape_utils 1.1.0 (..more)"

[notifications at fedoraproject.org]

>From aadd518cee9e267ee8315e917db4a6713664f22c Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Fri, 27 Mar 2015 09:36:37 -0600
Subject: Update to escape_utils 1.1.0

- Drop Fedora 19 support
- Simplify "bench" and "scripts" directory removals in %prep
- Fix comparison for Minitest::Unit::TestCase backwards compatibility
- Use %license macro

diff --git a/.gitignore b/.gitignore
index 31f1bdf..e171684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /escape_utils-1.0.1.gem
+/escape_utils-1.1.0.gem
diff --git a/rubygem-escape_utils.spec b/rubygem-escape_utils.spec
index 4894232..f648ae1 100644
--- a/rubygem-escape_utils.spec
+++ b/rubygem-escape_utils.spec
@@ -1,27 +1,26 @@
 %global gem_name escape_utils
 
 Name: rubygem-%{gem_name}
-Version: 1.0.1
-Release: 6%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
 Summary: Faster string escaping routines for your web apps
 Group: Development/Languages
 License: MIT
 URL: https://github.com/brianmario/escape_utils
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
+%if 0%{?fc20} || 0%{?el7}
 Requires: ruby(release)
 Requires: ruby(rubygems)
 %endif
-BuildRequires: ruby(release)
-BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
+BuildRequires: rubygems-devel
 BuildRequires: rubygem(minitest)
-%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
+%if 0%{?fc20} || 0%{?el7}
 Provides: rubygem(%{gem_name}) = %{version}
 %endif
 
 %description
-Quickly perform HTML, URL, URI and Javascript escaping/unescaping
+Quickly perform HTML, URL, URI and Javascript escaping/unescaping.
 
 
 %package doc
@@ -31,7 +30,7 @@ Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
 %description doc
-Documentation for %{name}
+Documentation for %{name}.
 
 %prep
 gem unpack %{SOURCE0}
@@ -41,15 +40,10 @@ gem unpack %{SOURCE0}
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
 # Remove developer-only files.
-for f in .gitignore .travis.yml Gemfile Rakefile; do
+for f in .gitignore .travis.yml Gemfile Rakefile benchmark/* script/*; do
   rm $f
   sed -i "s|\"$f\",||g" %{gem_name}.gemspec
 done
-# Remove developer-only directories.
-for d in benchmark script; do
-  rm -r $d
-  sed -i "s|\"$d/[^\"]*\",||g" %{gem_name}.gemspec
-done
 
 # Remove dependency on bundler
 sed -e "/require 'bundler\/setup'/d" -i test/helper.rb
@@ -57,7 +51,7 @@ sed -e "/require 'bundler\/setup'/d" -i test/helper.rb
 # Get the major version number of the Minitest gem
 minitest=$(ruby -r 'minitest/unit' \
   -e "puts Minitest::Unit::VERSION.split('.')[0]")
-if [ $minitest > 5 ]; then
+if [ $minitest < 5 ]; then
   # Conditionally correct Minitest usage, for Minitest versions < 5.0.0.
   # For example, at least Fedora 20 has Minitest 4.x.
   for f in $(find test -type f); do
@@ -76,11 +70,11 @@ rm .%{gem_instdir}/%{gem_name}.gemspec
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -pa .%{gem_dir}/* \
+cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 # Move the binary extension
-%if 0%{?fc19} || 0%{?fc20} || 0%{?el7}
+%if 0%{?fc20} || 0%{?el7}
   mkdir -p %{buildroot}%{gem_extdir_mri}/lib/%{gem_name}
   mv %{buildroot}%{gem_libdir}/%{gem_name}/%{gem_name}.so \
     %{buildroot}%{gem_extdir_mri}/lib/%{gem_name}
@@ -90,7 +84,8 @@ cp -pa .%{gem_dir}/* \
     %{buildroot}%{gem_extdir_mri}/
 %endif
 
-# Remove deprecated "ext" directory, preventing dangling symlink in -debuginfo.
+# Remove deprecated "ext" directory, preventing dangling symlink in -debuginfo
+# (rhbz#878863).
 rm -rf %{buildroot}%{gem_instdir}/ext
 
 
@@ -102,8 +97,9 @@ popd
 
 
 %files
+%{!?_licensedir:%global license %%doc}
 %dir %{gem_instdir}
-%doc %{gem_instdir}/MIT-LICENSE
+%license %{gem_instdir}/LICENSE
 %doc %{gem_instdir}/README.md
 %{gem_libdir}
 %{gem_extdir_mri}
@@ -116,6 +112,13 @@ popd
 
 
 %changelog
+* Fri Mar 27 2015 Ken Dreyer <ktdreyer at ktdreyer.com> - 1.1.0-1
+- Update to escape_utils 1.1.0
+- Drop Fedora 19 support
+- Simplify "bench" and "scripts" directory removals in %%prep
+- Fix comparison for Minitest::Unit::TestCase backwards compatibility
+- Use %%license macro
+
 * Thu Jan 15 2015 Vít Ondruch <vondruch at redhat.com> - 1.0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.2
 
diff --git a/sources b/sources
index ac7761f..1c7e684 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-09c870863a72bc84ee7169fb39843f08  escape_utils-1.0.1.gem
+c2ef842f9ac56b5bf18ecc6c82c64280  escape_utils-1.1.0.gem
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/rubygem-escape_utils.git/commit/?h=master&id=aadd518cee9e267ee8315e917db4a6713664f22c