From 69ea184c1271e0a10308a65cae421124d139fa0d Mon Sep 17 00:00:00 2001 From: josef radinger Date: Fri, 21 Nov 2025 09:59:21 +0100 Subject: [PATCH 1/8] bump version --- gmic.spec | 5 ++--- sources | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index a7de12c..6de7356 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,12 +5,11 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20250608git8bbd3d4a - +%global gmic_community_version 20251120gitea62768f Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.5.5 +Version: 3.6.3 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index cb15fd3..4b9e3c3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20250608git8bbd3d4a.tar.gz) = 0494f8e7af13150767e705fc611956d6715e2aa5409d41ac253effa68955b673edf700b896d11ddcd1ca8787555ddc3e0cc2b6ee99d27ef33c41410ee9bc25fe +SHA512 (gmic-community-20251120gitea62768f.tar.gz) = d50df4729264a36e585e12056bebb8961e9c0cf2cc114e3c252baaf2235e159f412d678d1778e38ed82e0e86fedbae7c489707e80c010bf99629ebb0529b635c SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.5.5.tar.gz) = df7e436e8f6c5849f31c6c039b7cd26b2565a9feb16b855f6f0246b3e0c5214179b1bda36d70d9853b7d5184f94c962039d2e9256099703776278d8c5030f649 +SHA512 (gmic_3.6.3.tar.gz) = 28ff0f356adec6c1736fe185049c389e405c807749c5cea3968dd388f28b451168c04bba1e726b2671f51ac57ba139ff4f13562ea92e3190eab0cf509996b068 From 71886142f63f2a1109693cb3ad07ad6692b29748 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 24 Nov 2025 19:09:06 +0100 Subject: [PATCH 2/8] bump version --- gmic.spec | 2 +- sources | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index 6de7356..893ca8a 100644 --- a/gmic.spec +++ b/gmic.spec @@ -9,7 +9,7 @@ Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.6.3 +Version: 3.6.4 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index 4b9e3c3..33a9dc0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20251120gitea62768f.tar.gz) = d50df4729264a36e585e12056bebb8961e9c0cf2cc114e3c252baaf2235e159f412d678d1778e38ed82e0e86fedbae7c489707e80c010bf99629ebb0529b635c -SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.6.3.tar.gz) = 28ff0f356adec6c1736fe185049c389e405c807749c5cea3968dd388f28b451168c04bba1e726b2671f51ac57ba139ff4f13562ea92e3190eab0cf509996b068 +SHA512 (gmic_3.6.4.tar.gz) = 8774b1c93479a6c63429c1515ddfb3a55f92eeb374e7d3e7a57f3929e597b789271b9f2c33fceb0c87899c7ebb30894f46d55c1abbaaf60752588f34bb579e29 +SHA512 (gmic-community-20251121git8dd9587e.tar.gz) = da87d7e4ae3c3c08a978990e880b91da62bb81a6b96534f42b5b694e768398f23c5aebb8b194f735f5eb75b9bef2f3fb4e2ffdf1d66c31f7133717ab91aac3bc +SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 From 2fadffa6052567f1b795afcba7ddb169216621c9 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Mon, 24 Nov 2025 19:17:27 +0100 Subject: [PATCH 3/8] bump version --- gmic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmic.spec b/gmic.spec index 893ca8a..8863876 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,7 +5,7 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20251120gitea62768f +%global gmic_community_version 20251121git8dd9587e Summary: GREYC's Magic for Image Computing Name: gmic From db77df619b091b2e9fdad91f457a9256b8283e81 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 11 Dec 2025 11:48:19 +0100 Subject: [PATCH 4/8] Rebuilt for OpenCV-4.12 From 970a112d1aa5ffbc1cf07f4b8730aa617e444856 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Thu, 18 Dec 2025 09:19:57 +0100 Subject: [PATCH 5/8] bump version --- gmic.spec | 4 ++-- sources | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index 8863876..c42e541 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,11 +5,11 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20251121git8dd9587e +%global gmic_community_version 20251215git882c6a2f Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.6.4 +Version: 3.6.5 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index 33a9dc0..8ce3b99 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.6.4.tar.gz) = 8774b1c93479a6c63429c1515ddfb3a55f92eeb374e7d3e7a57f3929e597b789271b9f2c33fceb0c87899c7ebb30894f46d55c1abbaaf60752588f34bb579e29 -SHA512 (gmic-community-20251121git8dd9587e.tar.gz) = da87d7e4ae3c3c08a978990e880b91da62bb81a6b96534f42b5b694e768398f23c5aebb8b194f735f5eb75b9bef2f3fb4e2ffdf1d66c31f7133717ab91aac3bc +SHA512 (gmic_3.6.5.tar.gz) = cde806bef9e4bca5b06a4306db79c50eded711fd815e310afeff916d96c85c0c9d04487f7c49f4cc2b2e03847d24b3d9c3170b0a1359cd4d0edc4416b9b91e1d +SHA512 (gmic-community-20251215git882c6a2f.tar.gz) = 9977b99ba307d009707a02bd9968549f8729bfff43b9e2ad31a6631001811cab63b0c93513b7fc2a322d13d8e40ae992927d33c6e08ecd11e75840bb2035cacd SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 From f9fe53d132bb06551aecf14e7b93315be511d4e1 Mon Sep 17 00:00:00 2001 From: josef radinger Date: Sat, 3 Jan 2026 20:11:55 +0100 Subject: [PATCH 6/8] bump version --- gmic.spec | 4 ++-- sources | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gmic.spec b/gmic.spec index c42e541..c5ea896 100644 --- a/gmic.spec +++ b/gmic.spec @@ -5,11 +5,11 @@ # As generated by new-snapshot.sh script %global zart_version 20231127gitd014169 %global gmic_qt_version 20250520gitb55b8ca -%global gmic_community_version 20251215git882c6a2f +%global gmic_community_version 20251227git7e21d80b Summary: GREYC's Magic for Image Computing Name: gmic -Version: 3.6.5 +Version: 3.6.6 %global shortver %(foo=%{version}; echo ${foo//./}) Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz diff --git a/sources b/sources index 8ce3b99..bae85e9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225 -SHA512 (gmic_3.6.5.tar.gz) = cde806bef9e4bca5b06a4306db79c50eded711fd815e310afeff916d96c85c0c9d04487f7c49f4cc2b2e03847d24b3d9c3170b0a1359cd4d0edc4416b9b91e1d -SHA512 (gmic-community-20251215git882c6a2f.tar.gz) = 9977b99ba307d009707a02bd9968549f8729bfff43b9e2ad31a6631001811cab63b0c93513b7fc2a322d13d8e40ae992927d33c6e08ecd11e75840bb2035cacd +SHA512 (gmic_3.6.6.tar.gz) = 500cc5f860b9e4791858f36785913871677ce125e0359693ffaaee68234ce2808ff94b1153f131042795c8888366a280430ad2647769b03c9ac2ae803b540ff9 +SHA512 (gmic-community-20251227git7e21d80b.tar.gz) = 8f472a79b609b1e6562587df77126f5fe0a2837960a34df16fe2376a7b20ac208fa094720d8c539cb23d04b1039b20b1bf3c546312fcc0cb2e666624c7adaeb6 SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71 From fee4dfa995f714967bb10fdc7711505d27fb198c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 5 Jan 2026 10:46:09 -0500 Subject: [PATCH 7/8] Fix duplicate nested plugin sub-directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: rhbz#2414313 Signed-off-by: Daniel P. Berrangé --- gmic.spec | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index c5ea896..873b12a 100644 --- a/gmic.spec +++ b/gmic.spec @@ -1,4 +1,4 @@ -%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins/gmic_gimp_qt +%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins %global use_system_cimg 1 @@ -156,9 +156,7 @@ iconv -f iso8859-1 -t utf-8 COPYING > COPYING.conv && mv -f COPYING.conv COPYING iconv -f iso8859-1 -t utf-8 COPYING-libcgmic > COPYING-libcgmic.conv && mv -f COPYING-libcgmic.conv COPYING-libcgmic cd src -# Makefile hardcodes gimptool-2.0 for setting PLUGIN var, so -# override for gimp-3 compat until upstream fixes its rules -make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} PLUGIN=%{gimpplugindir} install +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} install desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gmic_qt.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zart.desktop @@ -192,16 +190,36 @@ fi # cpio can't handle file -> dir replacements, so must manually # purge the old file path. # +# Then also handle upgrades from a botched update to 3.5.5 which +# created an extra sub-directory level. +# +# cpio can't handle dir -> file replacements, so must manually +# purge the old directory path. +# # Workaround could be removed in Fedora >= 45 timeframe at which # point we shouldn't see any legacy files around in a normal # upgrade scenario. %pretrans -p gimp -path = "%{gimpplugindir}" +path = "%{gimpplugindir}/gmic_gimp_qt" st = posix.stat(path) if st and st.type == "regular" then os.remove(path) end +path = "%{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt" +st = posix.stat(path) +if st and st.type == "directory" then + status = os.rename(path, path .. ".rpmmoved") + if not status then + suffix = 0 + while not status do + suffix = suffix + 1 + status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) + end + os.rename(path, path .. ".rpmmoved") + end +end + %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -230,6 +248,9 @@ end %files gimp %dir %{gimpplugindir} %{gimpplugindir}/gmic_gimp_qt +# Remove ghosts in Fedora >= 45, see pretrans script +%ghost %{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt.rpmmoved +%ghost %{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt.rpmmoved/gmic_gimp_qt %dir %{_datadir}/gmic %{_datadir}/gmic/gmic_cluts.gmz %{_datadir}/gmic/gmic_denoise_cnn.gmz From 25ffec04afeafa74548c5f1b27e0caa7922939c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 5 Jan 2026 10:46:09 -0500 Subject: [PATCH 8/8] Fix duplicate nested plugin sub-directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: rhbz#2414313 Signed-off-by: Daniel P. Berrangé --- gmic.spec | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/gmic.spec b/gmic.spec index a7de12c..174e6d6 100644 --- a/gmic.spec +++ b/gmic.spec @@ -1,4 +1,4 @@ -%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins/gmic_gimp_qt +%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins %global use_system_cimg 1 @@ -157,9 +157,7 @@ iconv -f iso8859-1 -t utf-8 COPYING > COPYING.conv && mv -f COPYING.conv COPYING iconv -f iso8859-1 -t utf-8 COPYING-libcgmic > COPYING-libcgmic.conv && mv -f COPYING-libcgmic.conv COPYING-libcgmic cd src -# Makefile hardcodes gimptool-2.0 for setting PLUGIN var, so -# override for gimp-3 compat until upstream fixes its rules -make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} PLUGIN=%{gimpplugindir} install +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} install desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gmic_qt.desktop desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zart.desktop @@ -193,16 +191,36 @@ fi # cpio can't handle file -> dir replacements, so must manually # purge the old file path. # +# Then also handle upgrades from a botched update to 3.5.5 which +# created an extra sub-directory level. +# +# cpio can't handle dir -> file replacements, so must manually +# purge the old directory path. +# # Workaround could be removed in Fedora >= 45 timeframe at which # point we shouldn't see any legacy files around in a normal # upgrade scenario. %pretrans -p gimp -path = "%{gimpplugindir}" +path = "%{gimpplugindir}/gmic_gimp_qt" st = posix.stat(path) if st and st.type == "regular" then os.remove(path) end +path = "%{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt" +st = posix.stat(path) +if st and st.type == "directory" then + status = os.rename(path, path .. ".rpmmoved") + if not status then + suffix = 0 + while not status do + suffix = suffix + 1 + status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) + end + os.rename(path, path .. ".rpmmoved") + end +end + %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -231,6 +249,9 @@ end %files gimp %dir %{gimpplugindir} %{gimpplugindir}/gmic_gimp_qt +# Remove ghosts in Fedora >= 45, see pretrans script +%ghost %{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt.rpmmoved +%ghost %{gimpplugindir}/gmic_gimp_qt/gmic_gimp_qt.rpmmoved/gmic_gimp_qt %dir %{_datadir}/gmic %{_datadir}/gmic/gmic_cluts.gmz %{_datadir}/gmic/gmic_denoise_cnn.gmz