[packages/ruby-haml] Up to 7.2.0
arekm
arekm at pld-linux.org
Thu Mar 19 07:42:49 CET 2026
commit 0cd5f60f9ad8a7df0c2299647315c02dee85cda7
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Mar 19 07:42:26 2026 +0100
Up to 7.2.0
5017d332-Add-Haml-TestCase.patch | 169 ---------------------------------------
ruby-haml.spec | 28 +++----
2 files changed, 13 insertions(+), 184 deletions(-)
---
diff --git a/ruby-haml.spec b/ruby-haml.spec
index ddf7abb..935218f 100644
--- a/ruby-haml.spec
+++ b/ruby-haml.spec
@@ -6,28 +6,26 @@
%define pkgname haml
Summary: An elegant, structured XHTML/XML templating engine
Name: ruby-%{pkgname}
-Version: 4.0.5
-Release: 3
-License: MIT and WTFPL
+Version: 7.2.0
+Release: 1
+License: MIT
Group: Development/Languages
Source0: http://rubygems.org/gems/%{pkgname}-%{version}.gem
-# Source0-md5: 60c17bbec24a4c8e44568380c96f60ad
+# Source0-md5: 6443af8d304d92afea2679078975388d
URL: http://haml-lang.com/
-# from https://github.com/haml/haml/commit/5017d332604a9b77b19401f6d2bcbef6479c3210
-# slightly modified to apply against current release
-Patch0: 5017d332-Add-Haml-TestCase.patch
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.665
%if %{with tests}
-BuildRequires: rubygem(erubis)
BuildRequires: rubygem(minitest)
BuildRequires: rubygem(nokogiri)
BuildRequires: rubygem(rails)
-BuildRequires: rubygem(sass)
+BuildRequires: rubygem(temple) >= 0.8.2
+BuildRequires: rubygem(thor)
+BuildRequires: rubygem(tilt)
BuildRequires: rubygems-devel
%endif
-Requires: rubygem(erubis)
-Requires: rubygem(sass)
+Requires: rubygem(temple) >= 0.8.2
+Requires: rubygem(thor)
Requires: rubygem(tilt)
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -50,21 +48,21 @@ Documentation for %{name}
%prep
%setup -q -n %{pkgname}-%{version}
-%patch -P0 -p1
+%{__sed} -i -e '1s,#!.*ruby,#!%{__ruby},' exe/haml
%build
# write .gemspec
%__gem_helper spec
%if %{with tests}
-ruby -Ilib:test test/*_test.rb
+%{__ruby} -Ilib:test test/*_test.rb
%endif
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir},%{_bindir}}
cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
-cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
+cp -a exe/* $RPM_BUILD_ROOT%{_bindir}
cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
%clean
@@ -72,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc MIT-LICENSE CHANGELOG.md FAQ.md REFERENCE.md README.md
+%doc CHANGELOG.md README.md
%attr(755,root,root) %{_bindir}/haml
%{ruby_vendorlibdir}/haml.rb
%{ruby_vendorlibdir}/haml
diff --git a/5017d332-Add-Haml-TestCase.patch b/5017d332-Add-Haml-TestCase.patch
deleted file mode 100644
index 231a5de..0000000
--- a/5017d332-Add-Haml-TestCase.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-diff --git a/test/engine_test.rb b/test/engine_test.rb
-index 3b47217..5049340 100644
---- a/test/engine_test.rb
-+++ b/test/engine_test.rb
-@@ -1,7 +1,7 @@
- # -*- coding: utf-8 -*-
- require 'test_helper'
-
--class EngineTest < MiniTest::Unit::TestCase
-+class EngineTest < Haml::TestCase
- # A map of erroneous Haml documents to the error messages they should produce.
- # The error messages may be arrays;
- # if so, the second element should be the line number that should be reported for the error.
-diff --git a/test/filters_test.rb b/test/filters_test.rb
-index 5f16d2e..ca767ed 100644
---- a/test/filters_test.rb
-+++ b/test/filters_test.rb
-@@ -1,6 +1,6 @@
- require 'test_helper'
-
--class FiltersTest < MiniTest::Unit::TestCase
-+class FiltersTest < Haml::TestCase
- test "should be registered as filters when including Haml::Filters::Base" do
- begin
- refute Haml::Filters.defined.has_key? "bar"
-@@ -116,7 +116,7 @@ class FiltersTest < MiniTest::Unit::TestCase
-
- end
-
--class ErbFilterTest < MiniTest::Unit::TestCase
-+class ErbFilterTest < Haml::TestCase
- test "multiline expressions should work" do
- html = "foobarbaz\n"
- haml = %Q{:erb\n <%= "foo" +\n "bar" +\n "baz" %>}
-@@ -137,7 +137,7 @@ class ErbFilterTest < MiniTest::Unit::TestCase
-
- end
-
--class JavascriptFilterTest < MiniTest::Unit::TestCase
-+class JavascriptFilterTest < Haml::TestCase
- test "should interpolate" do
- scope = Object.new.instance_eval {foo = "bar"; nil if foo; binding}
- haml = ":javascript\n \#{foo}"
-@@ -183,7 +183,7 @@ class JavascriptFilterTest < MiniTest::Unit::TestCase
- end
- end
-
--class CSSFilterTest < MiniTest::Unit::TestCase
-+class CSSFilterTest < Haml::TestCase
- test "should wrap output in CDATA and a CSS tag when output is XHTML" do
- html = "<style type='text/css'>\n /*<![CDATA[*/\n foo\n /*]]>*/\n</style>\n"
- haml = ":css\n foo"
-@@ -222,7 +222,7 @@ class CSSFilterTest < MiniTest::Unit::TestCase
- end
- end
-
--class CDATAFilterTest < MiniTest::Unit::TestCase
-+class CDATAFilterTest < Haml::TestCase
- test "should wrap output in CDATA tag" do
- html = "<![CDATA[\n foo\n]]>\n"
- haml = ":cdata\n foo"
-@@ -230,7 +230,7 @@ class CDATAFilterTest < MiniTest::Unit::TestCase
- end
- end
-
--class EscapedFilterTest < MiniTest::Unit::TestCase
-+class EscapedFilterTest < Haml::TestCase
- test "should escape ampersands" do
- html = "&\n"
- haml = ":escaped\n &"
-@@ -238,7 +238,7 @@ class EscapedFilterTest < MiniTest::Unit::TestCase
- end
- end
-
--class RubyFilterTest < MiniTest::Unit::TestCase
-+class RubyFilterTest < Haml::TestCase
- test "can write to haml_io" do
- haml = ":ruby\n haml_io.puts 'hello'\n"
- html = "hello\n"
-@@ -256,4 +256,4 @@ class RubyFilterTest < MiniTest::Unit::TestCase
- html = "7\n"
- assert_equal(html, render(haml))
- end
--end
-\ No newline at end of file
-+end
-diff --git a/test/helper_test.rb b/test/helper_test.rb
-index bf6b718..c845436 100644
---- a/test/helper_test.rb
-+++ b/test/helper_test.rb
-@@ -27,6 +27,6 @@ class FormModel
- end
-
--class HelperTest < MiniTest::Unit::TestCase
-+class HelperTest < Haml::TestCase
- Post = Struct.new('Post', :body, :error_field, :errors)
- class PostErrors
- def on(name)
-diff --git a/test/parser_test.rb b/test/parser_test.rb
-index 3435562..b11c075 100644
---- a/test/parser_test.rb
-+++ b/test/parser_test.rb
-@@ -1,7 +1,7 @@
- require 'test_helper'
-
- module Haml
-- class ParserTest < MiniTest::Unit::TestCase
-+ class ParserTest < Haml::TestCase
-
- test "should raise error for 'else' at wrong indent level" do
- begin
-@@ -124,4 +124,4 @@ module Haml
- parser.parse
- end
- end
--end
-\ No newline at end of file
-+end
-diff --git a/test/template_test.rb b/test/template_test.rb
-index 59ccd75..0c8e636 100644
---- a/test/template_test.rb
-+++ b/test/template_test.rb
-@@ -38,7 +38,7 @@ class DummyController
- end
- end
-
--class TemplateTest < MiniTest::Unit::TestCase
-+class TemplateTest < Haml::TestCase
- TEMPLATE_PATH = File.join(File.dirname(__FILE__), "templates")
- TEMPLATES = %w{ very_basic standard helpers
- whitespace_handling original_engine list helpful
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index 5119945..394e7eb 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -41,14 +41,19 @@ require 'haml/template'
- Haml::Template.options[:ugly] = false
- Haml::Template.options[:format] = :xhtml
-
-+BASE_TEST_CLASS = if defined?(Minitest::Test)
-+ Minitest::Test
-+ else
-+ MiniTest::Unit::TestCase
-+ end
-+
- module Declarative
- def test(name, &block)
- define_method("test #{name}", &block)
- end
- end
-
--class MiniTest::Unit::TestCase
--
-+class Haml::TestCase < BASE_TEST_CLASS
- extend Declarative
-
- def render(text, options = {}, base = nil, &block)
-diff --git a/test/util_test.rb b/test/util_test.rb
-index 5c9222a..481decf 100644
---- a/test/util_test.rb
-+++ b/test/util_test.rb
-@@ -1,6 +1,6 @@
- require 'test_helper'
-
--class UtilTest < MiniTest::Unit::TestCase
-+class UtilTest < Haml::TestCase
- include Haml::Util
-
- def test_powerset
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-haml.git/commitdiff/0cd5f60f9ad8a7df0c2299647315c02dee85cda7
More information about the pld-cvs-commit
mailing list