diff --git a/rmagick-create-full-tarball.sh b/rmagick-create-full-tarball.sh index 4a60f3a..50b8afd 100644 --- a/rmagick-create-full-tarball.sh +++ b/rmagick-create-full-tarball.sh @@ -6,16 +6,6 @@ then exit 1 fi -preserve_timestamps() -{ - while read f - do - unixtime=$(git log -n 1 --pretty='%ct' -- $f) - touch -d "@${unixtime}" $f - done < <(git ls-tree -r --name-only HEAD) - -} - set -x set -e @@ -40,7 +30,6 @@ VERSION_TAG=RMagick_${VERSION_TAG} git clone https://github.com/rmagick/$NAME.git pushd ${NAME} git reset --hard ${VERSION_TAG} -preserve_timestamps popd ln -sf ${NAME} ${NAME}-${VERSION} diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec index 5d0da22..b933f44 100644 --- a/rubygem-rmagick.spec +++ b/rubygem-rmagick.spec @@ -8,8 +8,8 @@ Requires: (ImageMagick%{?_isa} >= %2 with ImageMagick%{?_isa} < %3)\ %{nil} Name: rubygem-%{gem_name} -Version: 6.1.5 -Release: 2%{?dist} +Version: 5.5.0 +Release: 1%{?dist} Summary: Ruby binding to ImageMagick # SPDX confirmed @@ -24,21 +24,17 @@ BuildRequires: gcc-c++ BuildRequires: rubygems-devel BuildRequires: ruby-devel BuildRequires: rubygem(pkg-config) -BuildRequires: rubygem(observer) BuildRequires: rubygem(test-unit) BuildRequires: rubygem(rspec) BuildRequires: rubygem(pry) -# Due to ext/RMagick/rmmain.cpp test_Magick_version(), for now +# Due to test/RMagick/rmmain.c test_Magick_version(), for now # we specify the exact version for ImageMagick -# -# With rmagick <= 5.5.0, ImageMagick X.Y.Z should all match, -# with rmagick >= 6.0.0, ImageMagick X.Y should match. %if 0%{?fedora} -%setIMver 45 1:7.1 1:7.2 -%setIMver 44 1:7.1 1:7.2 -%setIMver 43 1:7.1 1:7.2 -%setIMver 42 1:7.1 1:7.2 -%setIMver 41 1:7.1 1:7.2 +%setIMver 42 1:7.1.1 1:7.1.2 +%setIMver 41 1:7.1.1 1:7.1.2 +%setIMver 40 1:7.1.1 1:7.1.2 +%setIMver 39 1:7.1.1 1:7.1.2 +%setIMver 38 1:7.1.1 1:7.1.2 %endif Obsoletes: ruby-RMagick < 2.13.2 @@ -67,6 +63,17 @@ gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec # permission find . -name \*.rb -or -name \*.gif | xargs chmod ugo-x +# kill rpath +sed -i ext/RMagick/extconf.rb \ + -e '\@LDFLAGS@s|[ \t]*-Wl,-rpath,[^ \t][^ \t]*"|"|' + +# kill gcc optflags suppressing warnings +sed -i ext/RMagick/extconf.rb \ + -e "\@-std=gnu99@s|-Wno[^ \t'][^ \t']*||g" + +# observer is in standard lib, kill dependency for now +sed -i '\@runtime.*observer@d' %{gem_name}.gemspec + %build export MAKE="make %{?_smp_mflags}" # Make sure that .so is to be created newly @@ -145,51 +152,6 @@ done %doc %{gem_instdir}/examples/ %changelog -* Thu Jan 08 2026 Mamoru TASAKA - 6.1.5-2 -- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 - -* Sun Dec 28 2025 Mamoru TASAKA - 6.1.5-1 -- 6.1.5 - -* Wed Oct 29 2025 Mamoru TASAKA - 6.1.4-2 -- Apply upstream patch for ruby3_5 Ractor change for testsuite - -* Sun Aug 24 2025 Mamoru TASAKA - 6.1.4-1 -- 6.1.4 - -* Sun Aug 17 2025 Mamoru TASAKA - 6.1.3-1 -- 6.1.3 - -* Fri Jul 25 2025 Fedora Release Engineering - 6.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jul 20 2025 Mamoru TASAKA - 6.1.2-1 -- 6.1.2 - -* Sun Feb 02 2025 Mamoru TASAKA - 6.1.1-1 -- 6.1.1 - -* Sun Jan 19 2025 Mamoru TASAKA - 6.1.0-1 -- 6.1.0 - -* Sat Jan 18 2025 Fedora Release Engineering - 6.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Jan 07 2025 Mamoru TASAKA - 6.0.1-4 -- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 - -* Sat Nov 02 2024 Mamoru TASAKA - 6.0.1-3 -- Add BR: rubygem(observer) explicitly - -* Fri Jul 19 2024 Fedora Release Engineering - 6.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu May 16 2024 Mamoru TASAKA - 6.0.1-1 -- 6.0.1 - -* Fri May 03 2024 Mamoru TASAKA - 6.0.0-1 -- 6.0.0 - * Mon Apr 08 2024 Mamoru TASAKA - 5.5.0-1 - 5.5.0 diff --git a/sources b/sources index 6a164e1..a3b6eb1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rmagick-6.1.5.gem) = 15157dda3185e8677c08d9b33564d1c85e3c3573ad9f6ab2358c32ec8a790eb2aa765cde095f98eb500cd818e3b71535dd289524eb35c9c5e721be3af4b1ba18 -SHA512 (rubygem-rmagick-6.1.5-full.tar.gz) = ce65bacd8e775fc4751784d427ab52a5b936ca5a465751d63380d42e0928911389f3388474c936eeb59d93d242c9923240168911705c1243b8e5d195d258fd8a +SHA512 (rmagick-5.5.0.gem) = 42ff50670eb24d8fea9a0526791f7dfd78629df725874d5ba313f7d408c7d786756d9b85ad469bacc228b6c03843b4fec3d73381fc8acb9a0c720ebcb3eb7d3d +SHA512 (rubygem-rmagick-5.5.0-full.tar.gz) = 1e56cf78fe6f46633cec24f4fff507915b3142965e676caa5764d6e3d87fadb89562eb2b4155059444c31452715eacf8dce4d821d81d79e003e91227115e9e52