Skip to content

Instantly share code, notes, and snippets.

@pvalena
Created November 30, 2021 16:48
Show Gist options
  • Save pvalena/04b98c4011db26ceed5ffe12db8146e3 to your computer and use it in GitHub Desktop.
Save pvalena/04b98c4011db26ceed5ffe12db8146e3 to your computer and use it in GitHub Desktop.
NOTE: Gem::Specification#has_rdoc is deprecated with no replacement. It will be removed in Rubygems 4
Gem::Specification#has_rdoc called from /usr/share/gems/gems/gem-compare-0.0.7/lib/rubygems/comparator/utils.rb:112.
NOTE: Gem::Specification#has_rdoc is deprecated with no replacement. It will be removed in Rubygems 4
Gem::Specification#has_rdoc called from /usr/share/gems/gems/gem-compare-0.0.7/lib/rubygems/comparator/utils.rb:112.
Compared versions: ["5.0.4", "5.2.2"]
DIFFERENT email:
5.0.4: ["haml@googlegroups.com", "norman@njclarke.com"]
5.2.2: ["haml@googlegroups.com", "ronnie@dio.jp"]
DIFFERENT metadata:
5.0.4: {}
5.2.2: {"bug_tracker_uri"=>"https://github.com/haml/haml/issues", "changelog_uri"=>"https://github.com/haml/haml/blob/main/CHANGELOG.md", "documentation_uri"=>"http://haml.info/docs.html", "homepage_uri"=>"http://haml.info", "mailing_list_uri"=>"https://groups.google.com/forum/?fromgroups#!forum/haml", "source_code_uri"=>"https://github.com/haml/haml"}
DIFFERENT files:
5.0.4->5.2.2:
* Deleted:
.travis.yml
* Added:
.github/workflows/
DIFFERENT development dependencies:
5.0.4->5.2.2:
* Added:
simplecov [">= 0"] (development)
5.0.4->5.2.2:
* Updated
yard from: ["~> 0.8.0"] to: [">= 0"]
commit 9a1031262256d41c929d834396ba316e007fa84d
Author: Pavel Valena <pvalena@redhat.com>
Date: Wed May 19 10:49:13 2021 +0200
Update to haml 5.2.2
also update .spec and .gitignore files.
Resolves: rhbz#1710827
diff --git a/.gitignore b/.gitignore
index 5fd9793..00b3042 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-haml-3.1.7.gem/haml-4.0.5.gem
-/haml-4.0.7.gem
-/haml-5.0.1-tests.tgz
-/haml-5.0.1.gem
-/haml-5.0.4-tests.tgz
-/haml-5.0.4.gem
+/haml-*-tests.txz
+/haml-*.gem
diff --git a/rubygem-haml.spec b/rubygem-haml.spec
index e2f2c11..495b15e 100644
--- a/rubygem-haml.spec
+++ b/rubygem-haml.spec
@@ -2,15 +2,15 @@
%global gem_name haml
Name: rubygem-%{gem_name}
-Version: 5.0.4
-Release: 8%{?dist}
+Version: 5.2.2
+Release: 1%{?dist}
Summary: An elegant, structured (X)HTML/XML templating engine
License: MIT and WTFPL
URL: http://haml.info/
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# git clone https://github.com/haml/haml.git && cd haml
-# git checkout v5.0.4 && tar czvf haml-5.0.4-tests.tgz test/
-Source1: %{gem_name}-%{version}-tests.tgz
+# git clone --no-checkout https://github.com/haml/haml.git
+# git -C haml archive -v -o haml-5.2.2-tests.txz v5.2.2 test/
+Source1: %{gem_name}-%{version}-tests.txz
BuildRequires: ruby(release)
BuildRequires: rubygems-devel
BuildRequires: ruby
@@ -60,11 +60,17 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
%check
pushd .%{gem_instdir}
# Link test suite into the place.
-ln -s %{_builddir}/test test
+ln -s %{_builddir}/test .
# Get rid of Bundler.
sed -i '/[bB]undler/ s/^/#/' test/test_helper.rb
+# We don't care about code coverage
+sed -i '/[Ss]imple[Cc]ov/ s/^/#/g' test/test_helper.rb
+
+# Disable test_annotated_template_names that's not working (removed in next release)
+mv test/template_test.rb{,.disable}
+
# options_test.rb must be executed in isolation in order to prevent load
# order issues.
# https://github.com/haml/haml/issues/943
@@ -98,6 +104,10 @@ popd
%exclude %{gem_instdir}/yard/default/.gitignore
%changelog
+* Fri Sep 17 2021 Pavel Valena <pvalena@redhat.com> - 5.2.2-1
+- Update to haml 5.2.2.
+ Resolves: rhbz#1710827
+
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 4b81a03..322028a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (haml-5.0.4-tests.tgz) = e5137b41406881d0507393555e6603035a94a4bbf31d32dd7fad3513050648754ef5f481c1dd414530ad2a8c243c0f16edbff8d95de8a978683e380df18a4c2c
-SHA512 (haml-5.0.4.gem) = 3a3f34c3f74184b4807bb3a03c465aae040392e47eccde82535640faaa246278d35e417072a62c82e340d006203701854b342d938142f582a5de44deac2121a6
+SHA512 (haml-5.2.2.gem) = 1ac461357a7845fed9f9c96bb2bab4587b11f6bb2ae7900a8dd92a41a3215fe0eaeedef45a866dc70359a54bc39fafe397949b2c52ade128e8e6da84dae2b7c7
+SHA512 (haml-5.2.2-tests.txz) = 6c7d74fd325fa2ac4446ada016bb5b265499d9dc73b4331ab61a1241930f727bedac5507b43347db3f1ffefff7db51c5e41827c62d745cf10b9d7d31707a650f
On branch rebase
Your branch is up to date with 'pvalena/rebase'.
nothing to commit (use -u to show untracked files)
Everything up-to-date
Branch 'rebase' set up to track remote branch 'rebase' from 'pvalena'.
> Run copr build.
+ scripts/pkgs/cr-build.sh -c -t 30m rubygems
Created builds: 2995050
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment