PR#1: Update Compass Core to 1.0.3 - rpms/rubygem-compass-core

rpms / rubygem-compass-core

#1 Update Compass Core to 1.0.3

Opened 5 years ago by jaruga. Modified 3 years ago

rpms/ jaruga/rubygem-compass-core feautre/update-to-1.0.3 into rawhide

Jun Aruga • 5 years ago

ffd88d9

.gitignore

file modified

		`@@ -1,2 +1,4 @@`
		`/compass-core-1.0.1.gem`
		`/rubygem-compass-core-tests.tgz`
		`+ /compass-core-1.0.3.gem`
		`+ /rubygem-compass-core-1.0.3-tests.tgz`

rubygem-compass-core.spec

file modified

+20 -19

		`@@ -2,8 +2,8 @@`
		`%global gem_name compass-core`

		`Name: rubygem-%{gem_name}`
		`- Version: 1.0.1`
		`- Release: 9%{?dist}`
		`+ Version: 1.0.3`
		`+ Release: 1%{?dist}`
		`Summary: The Compass core stylesheet library`
		`Group: Development/Languages`
		`License: MIT`
		`@@ -13,11 +13,11 @@`
		`# upstream gem doesn't ship tests, pull in from upstream`
		`# git clone https://github.com/compass/compass.git`
		`# cd compass`
		`- # git checkout 1.0.1`
		`- # tar czvf rubygem-compass-core-tests.tgz core/test`
		`- Source1: rubygem-compass-core-tests.tgz`
		`+ # git checkout 1.0.3`
		`+ # tar czvf rubygem-compass-core-1.0.3-tests.tgz core/test`
		`+ Source1: rubygem-compass-core-%{version}-tests.tgz`

		`- # http://github.com/compass/compass/issue/1828`
		`+ # http://github.com/compass/compass/issues/1828`
		`# backported to compass 1.0.1`
		`Patch0: minitest5-core-1.0.1.patch`

		`@@ -46,24 +46,19 @@`
		`Documentation for %{name}.`

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

		`- %setup -q -D -T -n %{gem_name}-%{version}`
		`-`
		`- gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec`
		`-`
		`- tar xzvf %{SOURCE1}`
		`-`
		`- patch -p1 < %{PATCH0}`
		`+ # Relax dependency to use sass 3.5.`
		`+ # https://github.com/Compass/compass/pull/2140`
		`+ %gemspec_remove_dep -g sass ["< 3.5"]`
		`+ %gemspec_add_dep -g sass ["< 3.6"]`

		`%build`
		`# Create the gem as gem install only works on a gem file`
		`- gem build %{gem_name}.gemspec`
		`+ gem build ../%{gem_name}-%{version}.gemspec`

		`%gem_install`

		`- mv core/test .%{gem_instdir}`
		`-`
		`%install`
		`mkdir -p %{buildroot}%{gem_dir}`
		`cp -a .%{gem_dir}/* \`
		`@@ -72,6 +67,10 @@`
		`# Run the test suite`
		`%check`
		`pushd .%{gem_instdir}`
		`+ tar xzvf %{SOURCE1}`
		`+ cat %{PATCH0} \| patch -p1`
		`+ mv core/test .`
		`+ rm -rf core`
		`ruby -Ilib:test/units \`
		`-e 'Dir.glob "./test/units/*_test.rb", &method(:require)'`

		`@@ -86,16 +85,18 @@`
		`%exclude %{gem_cache}`
		`%{gem_spec}`
		`%doc %{gem_instdir}/LICENSE.txt`
		`+ %{gem_instdir}/VERSION`
		`%{gem_instdir}/data/`
		`%{gem_instdir}/stylesheets`
		`%{gem_instdir}/templates`
		`- %exclude %{gem_instdir}/test`

		`%files doc`
		`%doc %{gem_docdir}`
		`- %doc %{gem_instdir}/test`

		`%changelog`
		`+ * Tue Jun 05 2018 Jun Aruga <jaruga@redhat.com> - 1.0.3-1`
		`+ - Update Compass Core to 1.0.3`
		`+`
		`* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-9`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild`

sources

file modified

+2 -2

		`@@ -1,2 +1,2 @@`
		`- c6fdee615aafd1e6db66cf8e349bc95e compass-core-1.0.1.gem`
		`- cae39bf3f4a7d749e33ed68eada033b8 rubygem-compass-core-tests.tgz`
		`+ SHA512 (compass-core-1.0.3.gem) = 90ee9fbd2266fc3e437162c8920710e4885446333c8d4b5ae22c652c7572b93ce3071574fa74f432b0036795865f92c888a6d648ee20bf5618cf58fb7b2b1dd1`
		`+ SHA512 (rubygem-compass-core-1.0.3-tests.tgz) = 1117a382c5b3cfdf82d128961c6127b88f56a442f9b15d4ffb4fc4e488f2177f86fd7c951fa42802674f28fc3f1fdb3e987b1ba341b7b56fddb4a2cb99d7b586`

jaruga commented 5 years ago

Updated to latest version 1.0.3
Relax dependency to use Sass 3.5. Sass is going to be updated to 3.5 soon.
Prepare the test archive file: rubygem-compass-core-1.0.3-tests.tgz
Scratch build is ok https://koji.fedoraproject.org/koji/taskinfo?taskID=27439015

vondruch commented on line 34 of rubygem-compass-core.spec 5 years ago

Could you please use %gemspec_{remove,add}_dep macros instead?

vondruch commented on line 30 of rubygem-compass-core.spec 5 years ago

%patch0 -p1 could be used instead ....

rebased onto 7902f03

5 years ago

jaruga commented 5 years ago

@vondruch rebased. To use the macro without -s gemspec_file, I modified additional lines aligning the result of latest gem2rpm.

Just in case, I checked the dependency is set correctly by below command for created binary RPM.

$ rpm -qR rubygem-compass-core-1.0.3-1.fc29.noarch.rpm
(rubygem(multi_json) >= 1.0 with rubygem(multi_json) < 2)
(rubygem(sass) < 3.6 with rubygem(sass) >= 3.3.0)
rpmlib(CompressedFileNames) <= 3.0.4-1
rpmlib(FileDigests) <= 4.6.0-1
rpmlib(PayloadFilesHavePrefix) <= 4.0-1
rpmlib(PayloadIsXz) <= 5.2-1
rpmlib(RichDependencies) <= 4.12.0-1
ruby(rubygems)

%patch0 -p1 could be used instead ....

I moved the logic related to test to check section to simplify the logic. As a result, as %patch0 could not be used in the check section, patch command is used.

vondruch commented 5 years ago

LGTM

BTW there is not updated source file, so just merge is not enough to get the rebase working ....

rebased onto ffd88d9

5 years ago

jaruga commented 5 years ago

I did "fedpkg import" and rebased now.