From 7a8e63612f5271bd7b203b18a9fd5d3ba2c50d31 Mon Sep 17 00:00:00 2001 From: akhila-guruju Date: Fri, 20 Dec 2024 14:40:35 +0000 Subject: [PATCH 1/3] Upgrade: rubygem-pkg-config version to 1.5.7 --- .../rubygem-pkg-config.signatures.json | 4 +- .../rubygem-pkg-config.spec | 130 ++++++++++++------ cgmanifest.json | 4 +- 3 files changed, 90 insertions(+), 48 deletions(-) diff --git a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.signatures.json b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.signatures.json index e4c74f6621c..9b7e3208aa7 100644 --- a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.signatures.json +++ b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "pkg-config-1.4.5.tar.gz": "83b92b6e10d38faaede39fa815cc407400ae852e2badfc5b81d318b73861328b" + "pkg-config-1.5.7.gem": "713671c6af034325dc7e7c12026b02570fbb1358d9f3a023d3a001ce0159b1c7" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec index 07360a3b11c..8fe75ba683c 100644 --- a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec +++ b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec @@ -1,29 +1,31 @@ -Vendor: Microsoft Corporation -Distribution: Azure Linux +# Generated from pkg-config-1.0.3.gem by gem2rpm -*- rpm-spec -*- %global gem_name pkg-config -%undefine _changelog_trimtime -%undefine __brp_mangle_shebangs +%undefine __brp_mangle_shebangs + +Summary: A pkg-config implementation by Ruby +Name: rubygem-%{gem_name} +Version: 1.5.7 +Release: 2%{?dist} +# SPDX confirmed +License: LGPL-2.0-or-later +Vendor: Microsoft Corporation +Distribution: Azure Linux +URL: http://github.com/rcairo/pkg-config -Summary: A pkg-config implementation by Ruby -Name: rubygem-%{gem_name} -Version: 1.4.5 -Release: 4%{?dist} -License: LGPLv2+ -URL: https://github.com/rcairo/pkg-config -Source0: https://github.com/ruby-gnome/pkg-config/archive/refs/tags/%{version}.tar.gz#/%{gem_name}-%{version}.tar.gz +Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem # Observe test failure on test_cflags test_cflags_only_I # with pkgconf 1.4.2 -Patch0: rubygem-pkg-config-1.4.4-cflags-result-sort.patch +Patch0: rubygem-pkg-config-1.4.4-cflags-result-sort.patch Requires: ruby(release) BuildRequires: ruby(release) BuildRequires: rubygems-devel -%if 0%{?with_check} +# For %%check BuildRequires: rubygem(test-unit) +# mkmf.rb requires ruby-devel BuildRequires: ruby-devel BuildRequires: cairo-devel -%endif Requires: rubygems BuildArch: noarch @@ -41,59 +43,99 @@ This package contains documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} +mv ../%{gem_name}-%{version}.gemspec . + +%patch -P0 -p1 %build -gem build %{gem_name} +gem build ./%{gem_name}-%{version}.gemspec %gem_install %install -gem install %{gem_name}-%{version}.gem +rm -rf %{buildroot} mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}/%{gem_dir}/ -# Kill unneeded file -rm -f %{buildroot}%{gem_instdir}/extconf.rb +pushd %{buildroot}%{gem_instdir} +rm -rf \ + Gemfile \ + Rakefile \ + test/ \ + %{nil} +popd +rm -f %{buildroot}%{gem_cache} %check pushd .%{gem_instdir} -#rake test --verbose --trace -#ruby -Ilib -rubygems test/run-test.rb -cat > test.rb < - 1.4.5-4 -- Build from .tar.gz source. - -* Thu Feb 24 2022 Pawel Winogrodzki - 1.4.5-3 +* Fri Dec 20 2024 Akhila Guruju - 1.5.7-2 +- Initial Azure Linux import from Fedora 41 (license: MIT). - License verified. -* Fri Oct 15 2021 Pawel Winogrodzki - 1.4.5-2 -- Initial CBL-Mariner import from Fedora 34 (license: MIT). +* Fri Oct 25 2024 Mamoru TASAKA - 1.5.7-1 +- 1.5.7 + +* Fri Jul 19 2024 Fedora Release Engineering - 1.5.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 1.5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Nov 19 2023 Mamoru TASAKA - 1.5.6-1 +- 1.5.6 + +* Tue Sep 5 2023 Mamoru TASAKA - 1.5.5-1 +- 1.5.5 + +* Thu Aug 31 2023 Mamoru TASAKA - 1.5.3-1 +- 1.5.3 + +* Fri Jul 21 2023 Fedora Release Engineering - 1.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Mamoru TASAKA - 1.5.2-1 +- 1.5.2 + +* Fri Jan 20 2023 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Nov 30 2022 Mamoru TASAKA - 1.5.1-1 +- 1.5.1 + +* Sun Jul 31 2022 Mamoru TASAKA - 1.4.9-1 +- 1.4.9 + +* Sat Jul 23 2022 Fedora Release Engineering - 1.4.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Jan 17 2022 Mamoru TASAKA - 1.4.7-1 +- 1.4.7 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Apr 19 2021 Mamoru TASAKA - 1.4.6-1 +- 1.4.6 * Fri Feb 5 2021 Mamoru TASAKA - 1.4.5-1 - 1.4.5 diff --git a/cgmanifest.json b/cgmanifest.json index 9cfb3b4d0de..41328445cba 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -26934,8 +26934,8 @@ "type": "other", "other": { "name": "rubygem-pkg-config", - "version": "1.4.5", - "downloadUrl": "https://github.com/ruby-gnome/pkg-config/archive/refs/tags/1.4.5.tar.gz" + "version": "1.5.7", + "downloadUrl": "https://rubygems.org/downloads/pkg-config-1.5.7.gem" } } }, From 8b1763ca86bbe80c0498952c5bd68c1801636d50 Mon Sep 17 00:00:00 2001 From: akhila-guruju Date: Thu, 9 Jan 2025 11:18:48 +0000 Subject: [PATCH 2/3] build with tar.gz --- .../rubygem-pkg-config.signatures.json | 2 +- .../rubygem-pkg-config/rubygem-pkg-config.spec | 11 ++++------- cgmanifest.json | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.signatures.json b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.signatures.json index 9b7e3208aa7..5c8503080c9 100644 --- a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.signatures.json +++ b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "pkg-config-1.5.7.gem": "713671c6af034325dc7e7c12026b02570fbb1358d9f3a023d3a001ce0159b1c7" + "rubygem-pkg-config-1.5.7.tar.gz": "06fbbe133becb56bb440123792235d2558123ffb181745bc651c306d6b5edb42" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec index 8fe75ba683c..e91fc6a7ca2 100644 --- a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec +++ b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec @@ -11,12 +11,12 @@ Release: 2%{?dist} License: LGPL-2.0-or-later Vendor: Microsoft Corporation Distribution: Azure Linux -URL: http://github.com/rcairo/pkg-config +URL: https://github.com/rcairo/pkg-config -Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem +Source0: https://github.com/ruby-gnome/%{gem_name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz # Observe test failure on test_cflags test_cflags_only_I # with pkgconf 1.4.2 -Patch0: rubygem-pkg-config-1.4.4-cflags-result-sort.patch +Patch0: rubygem-pkg-config-1.4.4-cflags-result-sort.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -27,7 +27,6 @@ BuildRequires: rubygem(test-unit) BuildRequires: ruby-devel BuildRequires: cairo-devel Requires: rubygems - BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version}-%{release} @@ -43,12 +42,10 @@ This package contains documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version} -mv ../%{gem_name}-%{version}.gemspec . - %patch -P0 -p1 %build -gem build ./%{gem_name}-%{version}.gemspec +gem build %{gem_name} %gem_install %install diff --git a/cgmanifest.json b/cgmanifest.json index 41328445cba..41ecc996d43 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -26935,7 +26935,7 @@ "other": { "name": "rubygem-pkg-config", "version": "1.5.7", - "downloadUrl": "https://rubygems.org/downloads/pkg-config-1.5.7.gem" + "downloadUrl": "https://github.com/ruby-gnome/pkg-config/archive/refs/tags/1.5.7.tar.gz" } } }, From 0bc3ee33e7d03f1cf7da4354b2d86c094272317d Mon Sep 17 00:00:00 2001 From: akhila-guruju Date: Mon, 24 Feb 2025 11:35:20 +0000 Subject: [PATCH 3/3] %setup to %autosetup --- SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec index e91fc6a7ca2..838f7dc9f31 100644 --- a/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec +++ b/SPECS-EXTENDED/rubygem-pkg-config/rubygem-pkg-config.spec @@ -41,8 +41,7 @@ Requires: %{name} = %{version}-%{release} This package contains documentation for %{name}. %prep -%setup -q -n %{gem_name}-%{version} -%patch -P0 -p1 +%autosetup -p1 -n %{gem_name}-%{version} %build gem build %{gem_name}