changelog

@@ -1,6 +1,3 @@
-* Wed Jun 11 2025 josef radinger <cheese@nosuchhost.net> - 3.5.5-1
-- bump version
-
 * Wed Jan 29 2025 josef radinger <cheese@nosuchhost.net> - 3.5.2-1
 - bump version
 - set HOST=gimp

gmic.spec

@@ -1,15 +1,15 @@
-%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins
+%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins/gmic_gimp_qt
 
 %global use_system_cimg 1
 
 # As generated by new-snapshot.sh script
 %global zart_version 20231127gitd014169
-%global gmic_qt_version 20250520gitb55b8ca
-%global gmic_community_version 20251227git7e21d80b
+%global gmic_qt_version 20241231git41e86b9
+%global gmic_community_version 20250129gitf6fb9ace
 
 Summary: GREYC's Magic for Image Computing
 Name:    gmic
-Version: 3.6.6
+Version: 3.5.2
 %global shortver %(foo=%{version}; echo ${foo//./})
 Release: %autorelease
 Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz
@@ -156,7 +156,9 @@ 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
-make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} install
+# 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
 
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gmic_qt.desktop
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zart.desktop
@@ -190,36 +192,16 @@ 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 <lua> gimp
-path = "%{gimpplugindir}/gmic_gimp_qt"
+path = "%{gimpplugindir}"
 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 || :
 
@@ -248,9 +230,6 @@ 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

sources

@@ -1,4 +1,4 @@
-SHA512 (zart-20231127gitd014169.tar.gz) = a9b9497e764e785811b7fca66f305207842bf71f9cfbebfd474cf325b067d3145875ad530a5ac3d6f130284d509949cb10ff7c9004b3820f2fbc60a3873fb225
-SHA512 (gmic_3.6.6.tar.gz) = 500cc5f860b9e4791858f36785913871677ce125e0359693ffaaee68234ce2808ff94b1153f131042795c8888366a280430ad2647769b03c9ac2ae803b540ff9
-SHA512 (gmic-community-20251227git7e21d80b.tar.gz) = 8f472a79b609b1e6562587df77126f5fe0a2837960a34df16fe2376a7b20ac208fa094720d8c539cb23d04b1039b20b1bf3c546312fcc0cb2e666624c7adaeb6
-SHA512 (gmic-qt-20250520gitb55b8ca.tar.gz) = 31c6d2e0d407bad32a7e8eabe1c09d03766e9703af447f1986dab113a958c5472ae128f974f0346a26c02bcd6f3e13a08a5ef4d918d71466237339ed44a74f71
+SHA512 (gmic_3.5.2.tar.gz) = 3d70fd93c07e4a19a8022b7e33a224b0062b95f244dd254ccdbd3ac74587e9704e6bb2e1f85975a17af1e235f40452fde0c08b2c7cb935319edd8ca12453d202
+SHA512 (zart-20231127gitd014169.tar.gz) = 4d776f87116ea857f382180d85a88bc2a9dc11e58419ab0006bbd20cd31f8f9996a27ea931d5cde0bb12f0d318f93d0f21cdfa32e6f0a34c087a9ca56445e876
+SHA512 (gmic-qt-20241231git41e86b9.tar.gz) = 5c1531bab48d72948f3bdf5a46f3b031d03386212794408752fd3fd012cf9d2bda48942c72dd3f8aeffc38368eb7883a909c78be53a770b4c0647eaf98d9e9a2
+SHA512 (gmic-community-20250129gitf6fb9ace.tar.gz) = f830d493fd1db281d7c74202b946bbdf132f0949bc4e24257be8978a4e70a1eebd0d1afe9f0efbede4de69ed0642028ea30798390b4d098abc82540aa4603d28