#1 Update to haml 5.2.2
Merged 2 years ago by pvalena. Opened 3 years ago by pvalena.
rpms/ pvalena/rubygem-haml rebase  into  rawhide

file modified
+2 -6
@@ -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

file modified
+16 -6
@@ -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 @@ 

  %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 @@ 

  %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

  

file modified
+2 -2
@@ -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

also enhance .spec and .gitignore files.

Resolves: rhbz#1710827


To have latest haml gem in Fedora.


I've bumped to 5.2.1, there's an error with current Rails [Ruby 3.0 compatibility].


Update log: https://git.io/JUevh

rebased onto a92f085

3 years ago

Updated, retested, LGTM.

@mmorsi PTAL.

Please also consider adding @ruby-packagers-sig to commiters of this package.

rebased onto 38eedb1

2 years ago

rebased onto ca7a473

2 years ago

@pvalena thanks for the work. Could you remove "WIP: " from the title if you are ready to review?

The context we are interested in fixing the rubygem-haml is that rubygem-haml is required by the following packages. We were noticed it by the email "Orphaned packages looking for new maintainers".

$ dnf repoquery --disablerepo=* --enablerepo=rawhide --enablerepo rawhide-source --whatrequires rubygem-haml
Fedora - Rawhide - Developmental packages for the next Fedora release   4.8 MB/s |  57 MB     00:11----
Fedora - Rawhide - Source                                               1.9 MB/s | 7.3 MB     00:03----
Last metadata expiration check: 0:00:01 ago on Wed 19 May 2021 12:51:43 PM CEST.
rubygem-ammeter-0:1.1.4-8.fc34.src
rubygem-asciidoctor-0:2.0.15-1.fc35.src
rubygem-haml-doc-0:5.0.4-6.fc33.noarch
rubygem-sinatra-rabbit-0:1.1.6-14.fc34.noarch
rubygem-sinatra-rabbit-0:1.1.6-14.fc34.src
rubygem-tilt-0:2.0.10-4.fc34.src
vim-syntastic-haml-0:3.10.0-9.fc34.noarch

@pvalena thanks for the work. Could you remove "WIP: " from the title if you are ready to review?

It is not, that's why it's WIP and builds and checks are missing (and there's a build error, like the description says).

I'll let you know when it's ready.

rebased onto b7a7bc0

2 years ago

rebased onto 5e8452b

2 years ago

rebased onto 9a10312

2 years ago

Re-tested.
LGTM.


Copr build:
https://copr.fedorainfracloud.org/coprs/build/2995050

Checks:

  • Tests: ok
  • Syntax check: ok
  • Reverse dependencies: ok
  • Smoke test: ok
  • rpmlint: ok

Update log: https://git.io/JM2BS
Test log: https://git.io/JM2BH
gem2rpm diff: https://git.io/JM2BQ

Pull-Request has been merged by pvalena

2 years ago