From c8fd8378ef98dd7b6357d17952c35d29c7546a08 Mon Sep 17 00:00:00 2001 From: akhila-guruju Date: Thu, 19 Dec 2024 09:15:52 +0000 Subject: [PATCH 1/2] Upgrade: rubygem-flexmock version to 3.0.1 --- .../flexmock-create-missing-test-files.sh | 2 +- .../rubygem-flexmock.signatures.json | 6 +- .../rubygem-flexmock/rubygem-flexmock.spec | 104 +++++++++++++++--- cgmanifest.json | 4 +- 4 files changed, 95 insertions(+), 21 deletions(-) diff --git a/SPECS-EXTENDED/rubygem-flexmock/flexmock-create-missing-test-files.sh b/SPECS-EXTENDED/rubygem-flexmock/flexmock-create-missing-test-files.sh index d161658ef53..4e5625315a1 100644 --- a/SPECS-EXTENDED/rubygem-flexmock/flexmock-create-missing-test-files.sh +++ b/SPECS-EXTENDED/rubygem-flexmock/flexmock-create-missing-test-files.sh @@ -22,7 +22,7 @@ pushd $TMPDIR git clone https://github.com/doudou/flexmock.git cd flexmock -git reset --hard $VERSION +git reset --hard v$VERSION cd .. tar czf $CURDIR/flexmock-${VERSION}-test-missing-files.tar.gz flexmock/test/ diff --git a/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.signatures.json b/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.signatures.json index ff9c4077e09..7504bc951f9 100644 --- a/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.signatures.json +++ b/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.signatures.json @@ -1,5 +1,7 @@ { "Signatures": { - "rubygem-flexmock-2.3.6.tar.gz": "f52c6858a761ed035080a767c5ac91b65852092eacd1455425ad4c35897178fc" + "flexmock-3.0.1-test-missing-files.tar.gz": "04903e871570e5543b8e3b1007c5527ade93f513c64771ad9046be293c84c930", + "flexmock-3.0.1.gem": "f58a82058eb7ca0c802a7f82c5f867adcd93c5f2bd9da8d57ef5d3b36513586f", + "flexmock-create-missing-test-files.sh": "d31d3126887e9c13e3cc0824e45483a1626ed2b74b4e7ee3eb3dfcb519f012f7" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.spec b/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.spec index edab1f7b9a7..0572d174786 100644 --- a/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.spec +++ b/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.spec @@ -1,18 +1,20 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux %global gem_name flexmock Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 2.3.6 -Release: 8%{?dist} +Version: 3.0.1 +Release: 2%{?dist} License: MIT +Vendor: Microsoft Corporation +Distribution: Azure Linux URL: https://github.com/doudou/flexmock -Source0: https://github.com/doudou/%{gem_name}/archive/refs/tags/v%{version}.tar.gz#/rubygem-%{gem_name}-%{version}.tar.gz +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +Source1: %{gem_name}-%{version}-test-missing-files.tar.gz +# Source1 is created fron Source2 +Source2: flexmock-create-missing-test-files.sh Requires: ruby(release) BuildRequires: ruby(release) -BuildRequires: git BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) >= 5 BuildRequires: rubygem(rspec) >= 3 @@ -32,10 +34,14 @@ Requires: %{name} = %{version}-%{release} This package contains documentation for %{name}. %prep -%autosetup -S git -n %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} -a 1 +mv ../%{gem_name}-%{version}.gemspec . + +find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' +find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 %build -gem build %{gem_name} +gem build %{gem_name}-%{version}.gemspec %gem_install %install @@ -45,20 +51,41 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/ pushd %{buildroot}%{gem_instdir} rm -rf \ .autotest .gitignore .togglerc .travis.yml .yardopts \ + .github \ Gemfile \ Rakefile \ flexmock.blurb \ flexmock.gemspec \ - install.rb + install.rb \ + test/ \ + %{nil} popd +rm -f %{buildroot}%{gem_cache} + +%check +cp -a flexmock/test .%{gem_instdir} +pushd .%{gem_instdir} + +export RUBYOPT=-W:deprecated +export RUBYLIB=$(pwd)/lib:$(pwd):$(pwd)/test +ruby \ + -e 'Dir.glob("test/*_test.rb").each {|f| require f}' + +# Note: exclude failing tests for now +rspec test/rspec_integration/ \ + --exclude-pattern 'test/rspec_integration/spy_example_spec.rb' \ + %{nil} +popd + + %files %dir %{gem_instdir} -%doc %{gem_instdir}/[A-Z]* +%license %{gem_instdir}/LICENSE.txt +%doc %{gem_instdir}/[A-CR-Z]* %{gem_libdir} %{gem_instdir}/rakelib/ -%exclude %{gem_cache} %{gem_spec} %files doc @@ -67,12 +94,57 @@ popd %{gem_docdir}/ %changelog -* Mon Nov 28 2022 Muhammad Falak - 2.3.6-8 -- Switch to building tar.gz instead of .gem -- License verified +* Thu Dec 19 2024 Akhila Guruju - 3.0.1-2 +- Initial Azure Linux import from Fedora 41 (license: MIT). +- License verified. + +* Wed Sep 11 2024 Mamoru TASAKA - 3.0.1-1 +- 3.0.1 + +* Tue Sep 03 2024 Mamoru TASAKA - 3.0.0-1 +- 3.0.0 + +* Fri Jul 19 2024 Fedora Release Engineering - 2.3.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 2.3.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Aug 14 2023 Mamoru TASAKA - 2.3.8-1 +- 2.3.8 + +* Tue Aug 08 2023 Mamoru TASAKA - 2.3.6-15 +- Handle MiniTest 5.19+ + +* Fri Jul 21 2023 Fedora Release Engineering - 2.3.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 2.3.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.3.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 2.3.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.3.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.3.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Jan 24 2021 Mamoru TASAKA - 2.3.6-8 +- Patch to support ruby 3.0 + - Use binding.source_location for test + - Properly accept argument and keywords + - Relax error message on test a bit -* Fri Oct 15 2021 Pawel Winogrodzki - 2.3.6-7 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Wed Jul 29 2020 Fedora Release Engineering - 2.3.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Thu Jan 30 2020 Fedora Release Engineering - 2.3.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/cgmanifest.json b/cgmanifest.json index 5832a4ca3ec..5ef67c61c06 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -26294,8 +26294,8 @@ "type": "other", "other": { "name": "rubygem-flexmock", - "version": "2.3.6", - "downloadUrl": "https://github.com/doudou/flexmock/archive/refs/tags/v2.3.6.tar.gz" + "version": "3.0.1", + "downloadUrl": "https://rubygems.org/downloads/flexmock-3.0.1.gem" } } }, From d3cbe107ff679f6eb4ea26f31a674b3f95fb7e81 Mon Sep 17 00:00:00 2001 From: akhila-guruju Date: Wed, 15 Jan 2025 08:35:04 +0000 Subject: [PATCH 2/2] Build with .tar.gz --- .../flexmock-create-missing-test-files.sh | 32 ------------------- .../rubygem-flexmock.signatures.json | 4 +-- .../rubygem-flexmock/rubygem-flexmock.spec | 17 ++++------ cgmanifest.json | 2 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 SPECS-EXTENDED/rubygem-flexmock/flexmock-create-missing-test-files.sh diff --git a/SPECS-EXTENDED/rubygem-flexmock/flexmock-create-missing-test-files.sh b/SPECS-EXTENDED/rubygem-flexmock/flexmock-create-missing-test-files.sh deleted file mode 100644 index 4e5625315a1..00000000000 --- a/SPECS-EXTENDED/rubygem-flexmock/flexmock-create-missing-test-files.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -usage() { - echo "$0 " -} - -set -e -set -x - -if [ $# -lt 1 ] ; then - usage - exit 1 -fi - -VERSION=$1 - -TMPDIR=$(mktemp -d /var/tmp/flexmock-XXXXXX) -CURDIR=$(pwd) - -pushd $TMPDIR - -git clone https://github.com/doudou/flexmock.git - -cd flexmock -git reset --hard v$VERSION -cd .. - -tar czf $CURDIR/flexmock-${VERSION}-test-missing-files.tar.gz flexmock/test/ - -popd -rm -rf $TMPDIR - diff --git a/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.signatures.json b/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.signatures.json index 7504bc951f9..56b0d60c0b2 100644 --- a/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.signatures.json +++ b/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.signatures.json @@ -1,7 +1,5 @@ { "Signatures": { - "flexmock-3.0.1-test-missing-files.tar.gz": "04903e871570e5543b8e3b1007c5527ade93f513c64771ad9046be293c84c930", - "flexmock-3.0.1.gem": "f58a82058eb7ca0c802a7f82c5f867adcd93c5f2bd9da8d57ef5d3b36513586f", - "flexmock-create-missing-test-files.sh": "d31d3126887e9c13e3cc0824e45483a1626ed2b74b4e7ee3eb3dfcb519f012f7" + "rubygem-flexmock-3.0.1.tar.gz": "6a151b5ddd1d7b88976c54ae6dc268511265c0a576e239368f869072f23a9e56" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.spec b/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.spec index 0572d174786..e05e9c2a63f 100644 --- a/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.spec +++ b/SPECS-EXTENDED/rubygem-flexmock/rubygem-flexmock.spec @@ -8,16 +8,14 @@ License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux URL: https://github.com/doudou/flexmock -Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -Source1: %{gem_name}-%{version}-test-missing-files.tar.gz -# Source1 is created fron Source2 -Source2: flexmock-create-missing-test-files.sh +Source0: https://github.com/doudou/%{gem_name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Requires: ruby(release) BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: rubygem(minitest) >= 5 BuildRequires: rubygem(rspec) >= 3 +BuildRequires: git Requires: ruby(rubygems) Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch @@ -34,14 +32,10 @@ Requires: %{name} = %{version}-%{release} This package contains documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -a 1 -mv ../%{gem_name}-%{version}.gemspec . - -find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' -find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 +%autosetup -S git -n %{gem_name}-%{version} %build -gem build %{gem_name}-%{version}.gemspec +gem build %{gem_name} %gem_install %install @@ -82,10 +76,11 @@ popd %files %dir %{gem_instdir} %license %{gem_instdir}/LICENSE.txt -%doc %{gem_instdir}/[A-CR-Z]* +%doc %{gem_instdir}/[A-Z]* %{gem_libdir} %{gem_instdir}/rakelib/ +%exclude %{gem_cache} %{gem_spec} %files doc diff --git a/cgmanifest.json b/cgmanifest.json index 5ef67c61c06..b58ca3bfa91 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -26295,7 +26295,7 @@ "other": { "name": "rubygem-flexmock", "version": "3.0.1", - "downloadUrl": "https://rubygems.org/downloads/flexmock-3.0.1.gem" + "downloadUrl": "https://github.com/doudou/flexmock/archive/refs/tags/v3.0.1.tar.gz" } } },