diff --git a/marcel-0.3.2.gem b/marcel-1.0.2-test.tar.gz similarity index 58% rename from marcel-0.3.2.gem rename to marcel-1.0.2-test.tar.gz index 29e7683..ae28f55 100644 Binary files a/marcel-0.3.2.gem and b/marcel-1.0.2-test.tar.gz differ diff --git a/marcel-1.0.2.gem b/marcel-1.0.2.gem new file mode 100644 index 0000000..acb69eb Binary files /dev/null and b/marcel-1.0.2.gem differ diff --git a/rubygem-marcel-0.3.2-fix-spelling-error-on-rpmlint.patch b/rubygem-marcel-0.3.2-fix-spelling-error-on-rpmlint.patch deleted file mode 100644 index bf4531b..0000000 --- a/rubygem-marcel-0.3.2-fix-spelling-error-on-rpmlint.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/marcel.gemspec b/marcel.gemspec -index 8f33fd4..512c513 100644 ---- a/marcel.gemspec -+++ b/marcel.gemspec -@@ -8,7 +8,7 @@ Gem::Specification.new do |spec| - spec.version = Marcel::VERSION - spec.authors = ['Tom Ward'] - spec.email = ['tom@basecamp.com'] -- spec.summary = %q{Simple mime type detection using magic numbers, filenames, and extensions} -+ spec.summary = %q{Simple mime type detection using magic numbers, file names, and extensions} - spec.homepage = 'https://github.com/basecamp/marcel' - spec.license = 'MIT' diff --git a/rubygem-marcel.spec b/rubygem-marcel.spec index e3c91fe..5b69c76 100644 --- a/rubygem-marcel.spec +++ b/rubygem-marcel.spec @@ -1,13 +1,15 @@ %global gem_name marcel Name: rubygem-%{gem_name} -Version: 0.3.2 +Version: 1.0.2 Release: 1 Summary: Simple mime type detection using magic numbers, file names, and extensions -License: MIT +License: MIT and ASL 2.0 URL: https://github.com/basecamp/marcel Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Patch0: rubygem-marcel-0.3.2-fix-spelling-error-on-rpmlint.patch -BuildRequires: ruby(release) rubygems-devel ruby >= 2.2 rubygem(mimemagic) rubygem(minitest) +# git clone https://github.com/rails/marcel.git && cd marcel +# git archive -v -o marcel-1.0.2-test.tar.gz v1.0.2 test/ +Source1: %{gem_name}-%{version}-test.tar.gz +BuildRequires: ruby(release) rubygems-devel ruby >= 2.2 rubygem(minitest) BuildRequires: rubygem(rack) BuildArch: noarch %description @@ -21,8 +23,7 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -%patch0 -p1 +%setup -q -n %{gem_name}-%{version} -b 1 %build gem build ../%{gem_name}-%{version}.gemspec @@ -35,26 +36,26 @@ cp -a .%{gem_dir}/* \ %check pushd .%{gem_instdir} -ruby -Ilib:test -r 'pathname' -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' +ln -s %{_builddir}/test . +sed -i "/require 'byebug'/ s/^/#/" test/test_helper.rb +ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)' popd %files %dir %{gem_instdir} -%exclude %{gem_instdir}/.* %license %{gem_instdir}/MIT-LICENSE +%license %{gem_instdir}/APACHE-LICENSE %{gem_libdir} -%exclude %{gem_instdir}/marcel.gemspec %exclude %{gem_cache} %{gem_spec} %files doc %doc %{gem_docdir} -%{gem_instdir}/Gemfile -%{gem_instdir}/Gemfile.lock %doc %{gem_instdir}/README.md -%{gem_instdir}/Rakefile -%{gem_instdir}/test %changelog +* Thu Mar 03 2022 jiangxinyu - 1.0.2-1 +- update to 1.0.2 + * Wed Aug 19 2020 geyanan - 0.3.2-1 - package init