Skip to content

Instantly share code, notes, and snippets.

@pvalena
Created August 22, 2020 01:08
Show Gist options
  • Save pvalena/a6f8fbd9f63be2ed0e65bd87891d2ce2 to your computer and use it in GitHub Desktop.
Save pvalena/a6f8fbd9f63be2ed0e65bd87891d2ce2 to your computer and use it in GitHub Desktop.
>> Stash & reset the repository.
error: pathspec 'rebase' did not match any file(s) known to git
Switched to a new branch 'rebase'
fatal: 'pvalena/rebase' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
--> Could not push to 'pvalena/rebase': !
HEAD is now at 35493b3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Downloaded haml-5.1.2
+ sed -i '/^# git clone https:\/\/github.com\/haml\/haml.git && cd haml/ s/5.0.4/5.1.2/g' fedora/packages/rubygem-haml/rubygem-haml.spec
+ sed -i '/^# git checkout v5.0.4 && tar czvf haml-5.0.4-tests.tgz test\// s/5.0.4/5.1.2/g' fedora/packages/rubygem-haml/rubygem-haml.spec
$cmd: set -x; git clone https://github.com/haml/haml.git && cd haml; git checkout v5.1.2 && tar czvf haml-5.1.2-tests.tgz test/ && echo Ok || exit 1
>> execute $cmd.
+ git clone https://github.com/haml/haml.git
Cloning into 'haml'...
+ cd haml
+ git checkout v5.1.2
Note: switching to 'v5.1.2'.
You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.
If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:
git switch -c <new-branch-name>
Or undo this operation with:
git switch -
Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at 9be4e1fd Version 5.1.2
+ tar czvf haml-5.1.2-tests.tgz test/
test/
test/mocks/
test/mocks/article.rb
test/test_helper.rb
test/template_test_helper.rb
test/attribute_parser_test.rb
test/engine_test.rb
test/templates/
test/templates/standard_ugly.haml
test/templates/eval_suppressed.haml
test/templates/original_engine.haml
test/templates/partial_layout.haml
test/templates/with_bom.haml
test/templates/tag_parsing.haml
test/templates/action_view.haml
test/templates/_av_partial_1.haml
test/templates/partials.haml
test/templates/silent_script.haml
test/templates/whitespace_handling.haml
test/templates/nuke_inner_whitespace.haml
test/templates/_layout.erb
test/templates/helpers.haml
test/templates/_text_area_helper.html.haml
test/templates/nuke_outer_whitespace.haml
test/templates/breakage.haml
test/templates/very_basic.haml
test/templates/_partial.haml
test/templates/_layout_for_partial.haml
test/templates/list.haml
test/templates/standard.haml
test/templates/_text_area.haml
test/templates/content_for_layout.haml
test/templates/partial_layout_erb.erb
test/templates/helpful.haml
test/templates/just_stuff.haml
test/templates/render_layout.haml
test/templates/bemit.haml
test/templates/_av_partial_2.haml
test/markaby/
test/markaby/standard.mab
test/filters_test.rb
test/template_test.rb
test/erb/
test/erb/action_view.erb
test/erb/_av_partial_1.erb
test/erb/standard.erb
test/erb/_av_partial_2.erb
test/results/
test/results/just_stuff.xhtml
test/results/list.xhtml
test/results/partials.xhtml
test/results/tag_parsing.xhtml
test/results/helpful.xhtml
test/results/partial_layout_erb.xhtml
test/results/partial_layout.xhtml
test/results/original_engine.xhtml
test/results/standard.xhtml
test/results/nuke_outer_whitespace.xhtml
test/results/very_basic.xhtml
test/results/helpers.xhtml
test/results/content_for_layout.xhtml
test/results/silent_script.xhtml
test/results/render_layout.xhtml
test/results/whitespace_handling.xhtml
test/results/eval_suppressed.xhtml
test/results/nuke_inner_whitespace.xhtml
test/results/bemit.xhtml
test/gemfiles/
test/gemfiles/Gemfile.rails-5.0.x
test/gemfiles/Gemfile.rails-5.2.x
test/gemfiles/Gemfile.rails-4.0.x
test/gemfiles/Gemfile.rails-edge
test/gemfiles/.bundle/
test/gemfiles/.bundle/config
test/gemfiles/Gemfile.rails-5.1.x
test/gemfiles/Gemfile.rails-4.1.x
test/gemfiles/Gemfile.rails-5.0.x.erubi
test/gemfiles/Gemfile.rails-6.0.x
test/gemfiles/Gemfile.rails-4.2.x
test/options_test.rb
test/haml-spec/
test/parser_test.rb
test/util_test.rb
test/helpers_for_rails_test.rb
test/temple_line_counter_test.rb
test/helper_test.rb
+ echo Ok
Ok
renamed './haml/haml-5.1.2-tests.tgz' -> './haml-5.1.2-tests.tgz'
[rebase 572ef5e] Update to haml 5.1.2.
2 files changed, 9 insertions(+), 5 deletions(-)
HEAD is now at 572ef5e Update to haml 5.1.2.
NOTE: Gem::Specification#has_rdoc is deprecated with no replacement. It will be removed on or after 2018-12-01.
Gem::Specification#has_rdoc called from /home/lpcs/.gem/ruby/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 on or after 2018-12-01.
Gem::Specification#has_rdoc called from /home/lpcs/.gem/ruby/gems/gem-compare-0.0.7/lib/rubygems/comparator/utils.rb:112.
Compared versions: ["5.0.4", "5.1.2"]
DIFFERENT email:
5.0.4: ["haml@googlegroups.com", "norman@njclarke.com"]
5.1.2: ["haml@googlegroups.com", "ronnie@dio.jp"]
DIFFERENT metadata:
5.0.4: {}
5.1.2: {"bug_tracker_uri"=>"https://github.com/haml/haml/issues", "changelog_uri"=>"https://github.com/haml/haml/blob/master/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"}
5.0.4->5.1.2:
* Updated
yard from: ["~> 0.8.0"] to: [">= 0"]
>> Continue with commit ammend.
[rebase f0623c2] Update to haml 5.1.2.
Date: Sat Aug 22 03:02:45 2020 +0200
2 files changed, 9 insertions(+), 5 deletions(-)
commit f0623c2615d3b645fa4caff0e55c2c808279a338
Author: Pavel Valena <pvalena@redhat.com>
Date: Sat Aug 22 03:02:45 2020 +0200

 Update to haml 5.1.2.
 
 Resolves: rhbz#1710827

diff --git a/rubygem-haml.spec b/rubygem-haml.spec
index 1920de3..9e83745 100644
--- a/rubygem-haml.spec
+++ b/rubygem-haml.spec
@@ -2,14 +2,14 @@
 %global gem_name haml
 
 Name: rubygem-%{gem_name}
-Version: 5.0.4
-Release: 6%{?dist}
+Version: 5.1.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/
+# git checkout v5.1.2 && tar czvf haml-5.1.2-tests.tgz test/
 Source1: %{gem_name}-%{version}-tests.tgz
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
@@ -98,6 +98,10 @@ popd
 %exclude %{gem_instdir}/yard/default/.gitignore
 
 %changelog
+* Sat Aug 22 01:02:42 GMT 2020 Pavel Valena <pvalena@redhat.com> - 5.1.2-1
+- Update to haml 5.1.2.
+ Resolves: rhbz#1710827
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 4b81a03..2960326 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.1.2.gem) = 2ea8918916b5e9c8a0eb869a94e19ff7cee497dbfdf66f719ed71aa2350e9cecdf03b8fec009855da975946486a65b4ba4023d1be955143f48a564be5d544ce0
+SHA512 (haml-5.1.2-tests.tgz) = 595a44aa66940482cc6f1bdc4497e385ef702fa3888ed156cca6045c81c0a866987aea5452e9cb5534d61306d7fac95b1105be20851590fb666b4dafaf06a299
On branch rebase
nothing to commit (use -u to show untracked files)
remote: - to fedora-message
remote: Sending to redis to log activity and send commit notification emails
remote: * Publishing information for 3 commits
remote: - to fedora-message
remote:
remote: Create a pull-request for rebase
remote: https://src.fedoraproject.org/fork/pvalena/rpms/rubygem-haml/diff/master..rebase
remote:
To ssh://pkgs.fedoraproject.org/forks/pvalena/rpms/rubygem-haml.git
* [new branch] rebase -> rebase
Branch 'rebase' set up to track remote branch 'rebase' from 'pvalena'.
>> Run copr build.
+ scripts/pkgs/cr-build.sh -c rubygems
Created builds: 1623387
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment