#1 Update to puppet-lint 2.3.6
Closed 17 days ago by pvalena. Opened 4 months ago by pvalena.
rpms/ pvalena/rubygem-puppet-lint rebase  into  master

file modified
+1 -2

@@ -1,2 +1,1 @@ 

- /puppet-lint-0.2.1.gem

- /puppet-lint-1.1.0.gem

+ /puppet-lint-*.gem

file modified
+21 -40

@@ -1,35 +1,20 @@ 

  # Generated from puppet-lint-0.2.0.gem by gem2rpm -*- rpm-spec -*-

  %global gem_name puppet-lint

- %global rubyabi 1.9.1

  

  Name: rubygem-%{gem_name}

- Version: 1.1.0

- Release: 9%{?dist}

+ Version: 2.3.6

+ Release: 1%{?dist}

  Summary: Ensure your Puppet manifests conform with the Puppetlabs style guide

  License: MIT

  URL: http://puppet-lint.com/

  Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem

- # Patch already accepted upstream and will be in the next release

- # https://github.com/rodjek/puppet-lint/pull/141

- %if 0%{?fedora} >= 19

- Requires: ruby(release)

  BuildRequires: ruby(release)

- %else

- Requires: ruby(abi) >= %{rubyabi}

- BuildRequires: ruby(abi) >= %{rubyabi}

- %endif

- Requires: ruby(rubygems)

  BuildRequires: rubygems-devel

  BuildRequires: ruby

- # Leaving these out as rspec 3+ isn't in Fedora or epel yet.

- # BuildRequires: rubygem(rspec) => 3.0

- # BuildRequires: rubygem(rspec) < 4

- # BuildRequires: rubygem(rspec-its) => 1.0

- # BuildRequires: rubygem(rspec-its) < 2

- # BuildRequires: rubygem(rspec-collection_matchers) => 1.0

- # BuildRequires: rubygem(rspec-collection_matchers) < 2

+ BuildRequires: rubygem(rspec)

+ BuildRequires: rubygem(rspec-its)

+ BuildRequires: rubygem(rspec-collection_matchers) => 1.0

  BuildArch: noarch

- Provides: rubygem(%{gem_name}) = %{version}

  

  %description

  Checks your Puppet manifests against the Puppetlabs

@@ -44,23 +29,11 @@ 

  Documentation for %{name}

  

  %prep

- gem unpack %{SOURCE0}

- 

- %setup -q -D -T -n  %{gem_name}-%{version}

- 

- gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec

+ %setup -q -n %{gem_name}-%{version}

  

  %build

- mkdir -p .%{gem_dir}

- 

- # Create the gem as gem install only works on a gem file

- gem build %{gem_name}.gemspec

- 

- # gem install installs into a directory.  We set that to be a local

- # directory so that we can move it into the buildroot in install

- gem install --local --install-dir ./%{gem_dir} \

-             --bindir ./%{_bindir} \

-             --force --rdoc %{gem_name}-%{version}.gem

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

+ %gem_install

  

  %install

  mkdir -p %{buildroot}%{gem_dir}

@@ -76,9 +49,13 @@ 

  chmod a-x %{buildroot}%{gem_instdir}/lib/puppet-lint/bin.rb

  

  %check

- # Leaving these out as rspec 3+ isn't in Fedora or epel yet.

- # cd %{buildroot}%{gem_instdir}

- # rspec -Ilib spec

+ pushd .%{gem_instdir}

+ 

+ sed -i -e "/^require 'simplecov'$/,/^end$/ s/^/#/g" \

+   spec/spec_helper.rb

+ 

+ rspec spec

+ popd

  

  %files

  %dir %{gem_instdir}

@@ -88,18 +65,22 @@ 

  %{gem_instdir}/Gemfile

  %doc %{gem_instdir}/LICENSE

  %exclude %{gem_cache}

- %exclude %{gem_instdir}/.gitignore

- %exclude %{gem_instdir}/.travis.yml

+ %exclude %{gem_instdir}/.*

  %{gem_spec}

+ %exclude %{gem_instdir}/appveyor.yml

  

  %files doc

  %doc %{gem_docdir}

  %{gem_instdir}/%{gem_name}.gemspec

  %{gem_instdir}/Rakefile

  %doc %{gem_instdir}/README.md

+ %doc %{gem_instdir}/CHANGELOG.md

  %{gem_instdir}/spec

  

  %changelog

+ * Tue May 07 2019 Pavel Valena <pvalena@redhat.com> - 2.3.6-1

+ - Update to puppet-lint 2.3.6.

+ 

  * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-9

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- 81e8eb529d61c689f25f55ed0b03952b  puppet-lint-1.1.0.gem

+ SHA512 (puppet-lint-2.3.6.gem) = d162307e66bb5f1dd923f2f9fab55de7b4c5fad6264d7a1bae8df20bd45c5a786b66d9f5b3bd235230fea959c67242462e711212f65807040048f4c0be7122b9

also enhance .spec and .gitignore files.

To have newer package in Fedora.

https://bugzilla.redhat.com/show_bug.cgi?id=1349208


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

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

Checks:

  • rpmlint: ok
  • Tests run: ok
  • Dependent packages: ok
  • Install: ok
  • Smoke test(require): ok

This is only needed for CI building so can be %exclude

This is only needed for CI building so can be %exclude

You're right. Thanks for spotting this.

rebased onto ee9fa3c

2 months ago

rebased onto 8bf65bc

17 days ago

Pull-Request has been closed by pvalena

17 days ago