PR#2: Update to Sass 3.7.3 - rpms/rubygem-sass

rpms / rubygem-sass

#2 Update to Sass 3.7.3

Merged 5 years ago by pvalena. Opened 5 years ago by pvalena.

rpms/ pvalena/rubygem-sass rebase into master

Update to Sass 3.7.3

Pavel Valena • 5 years ago

7a17010

.gitignore

file modified

+2 -9

		`@@ -1,9 +1,2 @@`
		`- sass-3.2.3.gem/sass-3.2.6.gem`
		`- /sass-3.2.14.gem`
		`- /sass-3.3.8.gem`
		`- /sass-3.4.4.gem`
		`- /sass-3.4.19.gem`
		`- /sass-3.4.22.gem`
		`- /sass-3.4.23.gem`
		`- /sass-3.4.25.gem`
		`- /sass-3.5.6.gem`
		`+ /sass-*.gem`
		`+ /sass-*-tests.tgz`

rubygem-sass.spec

file modified

+20 -20

		`@@ -2,13 +2,17 @@`
		`%global gem_name sass`

		`Name: rubygem-%{gem_name}`
		`- Version: 3.5.6`
		`- Release: 2%{?dist}`
		`+ Version: 3.7.3`
		`+ Release: 1%{?dist}`
		`Summary: A powerful but elegant CSS compiler that makes CSS fun again`
		`- Group: Development/Languages`
		`License: MIT`
		`URL: http://sass-lang.com/`
		`Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem`
		`+ # git clone https://github.com/sass/ruby-sass.git`
		`+ # cd ruby-sass && git checkout 3.7.3`
		`+ # tar czvf sass-3.7.3-tests.tgz test/ Rakefile`
		`+ Source1: %{gem_name}-%{version}-tests.tgz`
		`+`
		`# Use listen as a depencency instead of sass-listen.`
		`# sass-listen is a fork from original listen v3.0 branch to support Ruby <= 2.1.`
		`# https://github.com/sass/ruby-sass/pull/65`
		`@@ -18,9 +22,6 @@`
		`BuildRequires: rubygem(listen)`
		`BuildRequires: rubygem(minitest)`
		`BuildArch: noarch`
		`- %if 0%{?rhel} == 7`
		`- Provides: rubygem(%{gem_name}) = %{version}`
		`- %endif`

		`%description`
		`Sass makes CSS fun again. Sass is an extension of CSS, adding`
		`@@ -31,7 +32,6 @@`

		`%package doc`
		`Summary: Documentation for %{name}`
		`- Group: Documentation`
		`Requires: %{name} = %{version}-%{release}`
		`BuildArch: noarch`

		`@@ -39,19 +39,14 @@`
		`Documentation for %{name}.`

		`%prep`
		`- gem unpack %{SOURCE0}`
		`-`
		`- %setup -q -D -T -n %{gem_name}-%{version}`
		`+ %setup -q -n %{gem_name}-%{version}`

		`- gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec`
		`- %gemspec_remove_dep -g sass-listen -s %{gem_name}.gemspec`
		`- %gemspec_add_dep -g listen -s %{gem_name}.gemspec`
		`+ %gemspec_remove_dep -g sass-listen -s ../%{gem_name}-%{version}.gemspec`
		`+ %gemspec_add_dep -g listen -s ../%{gem_name}-%{version}.gemspec`
		`%patch0 -p1`

		`%build`
		`-`
		`- gem build %{gem_name}.gemspec`
		`-`
		`+ gem build ../%{gem_name}-%{version}.gemspec`
		`%gem_install`

		`%install`
		`@@ -72,6 +67,9 @@`

		`%check`
		`pushd .%{gem_instdir}`
		`+`
		`+ tar xaf %{SOURCE1}`
		`+`
		`ruby -e 'Dir.glob "./test/*/_test.rb", &method(:require)'`
		`popd`

		`@@ -81,9 +79,9 @@`
		`%{_bindir}/sass-convert`
		`%{_bindir}/scss`
		`%exclude %{gem_instdir}/.*`
		`- %{gem_instdir}/CODE_OF_CONDUCT.md`
		`%license %{gem_instdir}/MIT-LICENSE`
		`- %doc %{gem_instdir}/REVISION`
		`+ # Required on runtime from version.rb`
		`+ %{gem_instdir}/REVISION`
		`%{gem_instdir}/VERSION`
		`%{gem_instdir}/VERSION_DATE`
		`%{gem_instdir}/VERSION_NAME`
		`@@ -97,12 +95,14 @@`

		`%files doc`
		`%doc %{gem_docdir}`
		`+ %doc %{gem_instdir}/CODE_OF_CONDUCT.md`
		`%doc %{gem_instdir}/CONTRIBUTING.md`
		`%doc %{gem_instdir}/README.md`
		`- %{gem_instdir}/Rakefile`
		`- %{gem_instdir}/test`

		`%changelog`
		`+ * Mon Jan 14 2019 Pavel Valena <pvalena@redhat.com> - 3.7.3-1`
		`+ - Update to Sass 3.7.3`
		`+`
		`* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.6-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`

sources

file modified

+2 -1

		`@@ -1,1 +1,2 @@`
		`- SHA512 (sass-3.5.6.gem) = de7ac9598a36e60cdb440b6c8b36fed638ce3384ff078000c4d59eccb76b65d1c944aad8568ee078d6f2ca228d4f4c512143065bc20c5f91d28c2f0a170de96e`
		`+ SHA512 (sass-3.7.3.gem) = 14f6209e92a4cad15f67b6c11a919f53edfb8abf9b9e89795252e43fccc2628feca2cb40387b0c268009e93a08d908eba0cdf94b21bece5e8232bbe2f41fea09`
		`+ SHA512 (sass-3.7.3-tests.tgz) = bfba5002e6452b97952881fab3fd55cd2c8c4f6cd3a9ddb0628dddfb56b48aa5f07b685914a350510bfa8104d44f9193da110cf229e588c4be8734f664491d72`

pvalena commented 5 years ago

also enhance .spec and .gitignore files.

Up-to-date Copr build:
https://copr.fedorainfracloud.org/coprs/build/846858/

Checks:

dependent packages: ok
tests run: ok
smoke test: TBD

jaruga commented on line 16 of rubygem-sass.spec 5 years ago

Why ".." and Rakefile are necessary?
tar czvf sass-3.7.3-tests.tgz test is not enough? seeing other cases such as rubygem-activeresupport.

jaruga commented on line 69 of rubygem-sass.spec 5 years ago

I did not know the -a option for auto compress to use archive suffix to determine the compression program.
I like it. :)

jaruga commented on line 95 of rubygem-sass.spec 5 years ago

Why did you move the files to end of the %files?
It's better to respect the dictionary order for the order of the files, isn't it?
It is the original idea of gem2rpm.

$ cat a.txt 
A
a
B
b

On the dictionary order, large capital is prioritized.

$ LC_ALL=C sort a.txt 
A
B
a
b

jaruga commented on line 103 of rubygem-sass.spec 5 years ago

Considering a dictionary order, moving this CODE_OF_CONDUCT.md line to before CONTRIBUTING.md is better, isn't it?

jaruga commented 5 years ago

I reviewed some things. Other parts look good to me.

pvalena commented 5 years ago

Why ".." and Rakefile are necessary?
tar czvf sass-3.7.3-tests.tgz test is not enough? seeing other cases such as rubygem-activeresupport.

Rakefile is used to in tests / to test the scope. .. is not really necessary, but places the archive to root of git repository, for easier location (on a line before there is cd ruby-sass/core AFAIR).

pvalena commented 5 years ago

Considering a dictionary order, moving this CODE_OF_CONDUCT.md line to before CONTRIBUTING.md is better, isn't it?

I do not really mind ordering it this way or that. I've just added it to the end. I did not check and I do not think it's really necessary in any way but I'll make the changes.

Why did you move the files to end of the %files?
It's better to respect the dictionary order for the order of the files, isn't it?

Actually, I wanted to move it to doc subpackage, but it was not possible, as is stated in the comment above the files. I'll move them back as I did not intend to change the order.

rebased onto 8df3d66

5 years ago

pvalena commented 5 years ago

@jaruga, updated, PTAL.

Edited 5 years ago by pvalena

jaruga commented 5 years ago

Now 1 question.

.. is not really necessary, but places the archive to root of git repository, for easier location (on a line before there is cd ruby-sass/core AFAIR).

I do not understand the meaning "there is cd ruby-sass/core AFAIR"
Where is the "core"directory?
https://github.com/sass/ruby-sass

pvalena commented 5 years ago