PR#2: Update to 0.2.0.beta2 prerelease. - rpms/rubygem-unf

rpms / rubygem-unf

#2 Update to 0.2.0.beta2 prerelease.

Closed a year ago by mtasaka. Opened 4 years ago by pvalena.

rpms/ pvalena/rubygem-unf rebase into rawhide

Update to 0.2.0.beta2 prerelease.

Pavel Valena • 4 years ago

4bdc1bd

.gitignore

file modified

+1 -3

		`@@ -1,3 +1,1 @@`
		`- /unf-0.1.2.gem`
		`- /unf-0.1.3.gem`
		`- /unf-0.1.4.gem`
		`+ /unf-*.gem`

rubygem-unf.spec

file modified

+37 -55

		`@@ -1,38 +1,28 @@`
		`%global gem_name unf`
		`- %if 0%{?fedora} < 19`
		`- %global rubyabi 1.9.1`
		`- %endif`

		`- %undefine __brp_mangle_shebangs`
		`+ %bcond_without tests`
		`+ %global prerelease .beta2`

		`Summary: Wrapper library to bring Unicode Normalization Form support to Ruby/JRuby`
		`Name: rubygem-%{gem_name}`
		`- Version: 0.1.4`
		`- Release: 14%{?dist}`
		`+ Version: 0.2.0`
		`+ Release: 1%{?dist}`

		`License: BSD`
		`URL: https://github.com/knu/ruby-unf`
		`- Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem`
		`+ Source0: http://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem`

		`- %if 0%{?fedora} >= 19`
		`- Requires: ruby(release)`
		`BuildRequires: ruby(release)`
		`- %else`
		`- Requires: ruby(abi) = %{rubyabi}`
		`- Requires: ruby`
		`- BuildRequires: ruby(abi) = %{rubyabi}`
		`BuildRequires: ruby`
		`- %endif`

		`- Requires: ruby(rubygems)`
		`- Requires: rubygem(unf_ext)`
		`BuildRequires: rubygems-devel`
		`# %%check`
		`+ %if %{with tests}`
		`BuildRequires: rubygem(minitest)`
		`- BuildRequires: rubygem(shoulda)`
		`+ BuildRequires: %{_bindir}/rake`
		`+ %endif`
		`BuildRequires: rubygem(unf_ext)`
		`BuildArch: noarch`
		`- Provides: rubygem(%{gem_name}) = %{version}-%{release}`

		`%description`
		`This is a wrapper library to bring Unicode Normalization Form support`
		`@@ -48,23 +38,16 @@`
		`Documentation for %{name}.`

		`%prep`
		`- %setup -q -c -T`
		`-`
		`- TOPDIR=$(pwd)`
		`- mkdir tmpunpackdir`
		`- pushd tmpunpackdir`
		`+ %setup -q -n %{gem_name}-%{version}%{?prerelease}`

		`- gem unpack %{SOURCE0}`
		`- cd %{gem_name}-%{version}`
		`+ sed -i '/^\s*s.extensions = / d' \`
		`+ ../%{gem_name}-%{version}%{?prerelease}.gemspec`

		`- gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec`
		`- gem build %{gem_name}.gemspec`
		`- mv %{gem_name}-%{version}.gem $TOPDIR`
		`-`
		`- popd`
		`- rm -rf tmpunpackdir`
		`+ %gemspec_remove_file Dir.glob("ext/*")`
		`+ rm -rf ext`

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

		`%install`
		`@@ -72,54 +55,53 @@`
		`cp -a .%{gem_dir}/* \`
		`%{buildroot}%{gem_dir}/`

		`- pushd %{buildroot}%{gem_instdir}`
		`- rm -rf \`
		`- Gemfile \`
		`- Rakefile \`
		`- *.gemspec \`
		`- .gitignore \`
		`- .travis.yml \`
		`- test/ \`
		`- %{nil}`
		`- popd`
		`-`
		`-`
		`+ %if %{with tests}`
		`%check`
		`pushd .%{gem_instdir}`
		`- sed -i.orig \`
		`+ sed -i \`
		`-e '/begin/,/end/d' \`
		`-e '/bundler/d' \`
		`test/helper.rb`

		`- %if 0%{?fedora} >= 21`
		`- sed -i.minitest \`
		`- -e 's\|Test::Unit::TestCase\|Minitest::Test\|' \`
		`- test/*.rb`
		`+ sed -i -e 's\|Test::Unit::TestCase\|Minitest::Test\|' \`
		`+ test/*.rb`
		`+`
		`cat > test/unit.rb << EOF`
		`gem "minitest"`
		`require "minitest/autorun"`
		`EOF`

		`- %endif`
		`+ # Rename tests to work with MiniTest`
		`+ sed -i 's/test "raise ArgumentError.*$/def test_raise_argumenterror/' \`
		`+ test/*.rb`
		`+ sed -i 's/test "pass all tests.*$/def test_pass_all_tests/' \`
		`+ test/*.rb`

		`- for f in test/test_*.rb`
		`- do`
		`- ruby -Ilib:test:. $f`
		`- done`
		`+ ruby -Ilib:test:. -e 'Dir.glob("test/test_*.rb").each(&method(:require))'`
		`popd`
		`+ %endif`

		`%files`
		`%dir %{gem_instdir}`
		`- %doc %{gem_instdir}/[A-Z]*`
		`-`
		`%{gem_libdir}/`
		`%exclude %{gem_cache}`
		`+ %exclude %{gem_instdir}/.*`
		`%{gem_spec}`
		`+ %license %{gem_instdir}/LICENSE`

		`%files doc`
		`%doc %{gem_docdir}`
		`+ %{gem_instdir}/*.gemspec`
		`+ %{gem_instdir}/test/`
		`+ %{gem_instdir}/Gemfile`
		`+ %{gem_instdir}/Rakefile`
		`+ %doc %{gem_instdir}/CHANGELOG.md`
		`+ %doc %{gem_instdir}/README.md`

		`%changelog`
		`+ * Fri Nov 15 2019 Pavel Valena <pvalena@redhat.com> - 0.2.0-1`
		`+ - Update to 0.2.0.beta2 prerelease.`
		`+`
		`* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-14`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- 64009f92a131c50bc1a932dc50d562c6 unf-0.1.4.gem`
		`+ SHA512 (unf-0.2.0.beta2.gem) = 41983505378e015dcd948ecb6de16112fd4b8fae8870e61ebb7767b056d743566a6fba3cf10be14e923ad7d86afbd4c38c3a02eaa0b59a3ddfa2244b560a12d2`

pvalena commented 4 years ago

also enhance .spec and .gitignore file.

To have latest unf gem in Fedora.

Up-to-date Koji scratch-build:
https://koji.fedoraproject.org/koji/taskinfo?taskID=41394108

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

Checks:

Syntax check: ok
Tests: ok
Dependent packages: ok
Smoke test: ok
rpmlint: ok

mtasaka commented 4 years ago

I think I said this to you before: please don't do multiple things on one pull request. i.e. don't do version update and spec cleanup simultaneously in one pull request. Please understand that this is very confusing and diffcult to check.
Please explain why beta is needed. And such request like "update to foo, please" should be filed using bugzilla.
And actually at least your release number does not follow packaging guideline.

I will not merge this request as it is.

pvalena commented 4 years ago

I think I said this to you before: please don't do multiple things on one pull request. i.e. don't do version update and spec cleanup simultaneously in one pull request. Please understand that this is very confusing and diffcult to check.

Hello, yes, I'll split it into multiple commits and we can look into those, would that be fine? I do not think it's a good way to do just a cleanup and a build for it (or not) without an upgrade that is buildable.

Please explain why beta is needed. And such request like "update to foo, please" should be filed using bugzilla.

I can create a bug for it, but as it's a beta and there's no pressing issue (both of those versions are 5+years old), but I find it nice to have it prepared / tested in case the upgrade it's needed due to some incompatibility. I also test it for compatibility with other builds I do. This PR is a way of sharing the work with you. Feel free not to merge it.

And actually at least your release number does not follow packaging guideline.

I must have missed that. It's actually a mistake + Release: 1%{?dist}.1 should be just + Release: 1%{?dist}. I believe the Fedora scratch-build has it correctly (and I pushed the correction). Is that correct?

Thank you for your insight I find most valuable, which is actualy one of the reasons I did create this PRs.

rebased onto 4bdc1bd

4 years ago

mtasaka commented a year ago

Once closing this. currently I don't think using beta version is needed for this package.