diff --git a/.gitignore b/.gitignore index c8a6374..359a03d 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ x86_64/ /gmic-community-*.tar.gz /gmic-community/ /zart*.tar.gz -/zart/ \ No newline at end of file +/zart/ +/41e86b969cc1142f3d9ca89fd8608b51352a3c37.patch diff --git a/changelog b/changelog new file mode 100644 index 0000000..88cb777 --- /dev/null +++ b/changelog @@ -0,0 +1,397 @@ +* Wed Jun 11 2025 josef radinger - 3.5.5-1 +- bump version + +* Wed Jan 29 2025 josef radinger - 3.5.2-1 +- bump version +- set HOST=gimp +- add /usr/share/gmic/gmic_scale2x_cnn.gmz to gimp-subpackage + +* Thu Jan 16 2025 Fedora Release Engineering - 3.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Jan 07 2025 josef radinger - 3.5.0-2 +- try to fix compilation +- switch to new git-repo (https://github.com/GreycLab/gmic-qt + instead of https://github.com/c-koi/gmic-qt) + + +* Sat Jan 04 2025 josef radinger - 3.5.0-1 +- bump version + +* Fri Oct 25 2024 Orion Poplawski - 3.4.3-2 +- Rebuild for hdf5 1.14.5 + +* Mon Oct 14 2024 josef radinger - 3.4.3-1 +- bump version + +* Thu Sep 12 2024 josef radinger - 3.4.2-5 +- missed the release being still on -4 +- Patch3: 0003-Host-Gimp-convert-to-new-GimpProcedureConfig-APIs.patch no longer needed + + +* Thu Sep 12 2024 josef radinger - 3.4.2-1 +- bump version +- Patch1: 0001-Host-Gimp-replace-GIMP_VERSION_LTE-with-GIMP_CHECK_V.patch no longer be needed +- Patch2: 0002-Host-Gimp-stop-open-coding-version-checks.patch no longer needed + +* Thu Aug 29 2024 Daniel P. Berrangé - 3.4.0-4 +- Update to new versions +- Fix GIMP 2.99.19 compat + +* Thu Jul 25 2024 Sérgio Basto - 3.4.0-3 +- Rebuild for opencv 4.10.0 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jun 24 2024 josef radinger - 3.4.0-1 +- bump version + +* Fri May 31 2024 Sérgio Basto - 3.3.6-1 +- Update gmic to 3.3.6 (#2083488) + +* Wed May 08 2024 Sérgio Basto - 3.3.5-1 +- Update gmic to 3.3.5 (#2083488) + +* Wed Apr 24 2024 Benjamin A. Beasley - 3.3.1-5 +- Rebuilt for openexr 3.2.4 + +* Mon Feb 05 2024 Sérgio Basto - 3.3.1-4 +- Rebuild for opencv 4.9.0 + +* Wed Jan 24 2024 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 3.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 09 2023 josef radinger - 3.3.1-1 +- bump version + +* Mon Aug 07 2023 Sérgio Basto - 3.2.6-3 +- Rebuild for opencv 4.8.0 + +* Wed Jul 19 2023 Fedora Release Engineering - 3.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 26 2023 josef radinger - 3.2.6-1 +- bump version + +* Tue May 30 2023 josef radinger - 3.2.5-1 +- bump version + +* Mon May 22 2023 josef radinger - 3.2.4-1 +- bump version +- remove Patch3 +- adjust rpath removal + +* Thu Jan 19 2023 Fedora Release Engineering - 3.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Sérgio Basto - 3.1.6-3 +- Rebuild for opencv 4.7.0 + +* Sun Nov 13 2022 josef radinger - 3.1.6-2 +- build + +* Tue Nov 08 2022 Sérgio Basto - 3.1.6-1 +- Update to 3.1.6 + +* Sun Oct 09 2022 Kalev Lember - 3.1.0-5 +- Split out gmic-libs to a subpackage + +* Wed Sep 07 2022 Kalev Lember - 3.1.0-4 +- Clean up multilib path install + +* Thu Jul 21 2022 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Jun 21 2022 Sérgio Basto - 3.1.0-2 +- Rebuilt for opencv 4.6.0 + +* Thu Apr 28 2022 josef radinger - 3.1.0-1 +- bump version +- disable patch0 +- disable patch2 +- BuildRequires: chrpath + +* Wed Jan 26 2022 josef radinger - 3.0.2-1 +- bump version + +* Thu Jan 20 2022 Fedora Release Engineering - 3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 14 2022 josef radinger -3.0.1-1 +- bump version +- add gmic_denoise_cnn.gmz to gimp-subpackage + +* Sat Dec 11 2021 josef radinger -3.0.0-1 +- bump version + +* Thu Nov 25 2021 Orion Poplawski - 2.9.9-2 +- Rebuild for hdf5 1.12.1 + +* Mon Sep 06 2021 josef radinger - 2.9.9-1 +- bump version + +* Sat Aug 21 2021 Richard Shaw - 2.9.8-4 +- Rebuild for OpenEXR/Imath 3.1. + +* Sat Jul 31 2021 Richard Shaw - 2.9.8-3 +- Rebuild with OpenEXR/Imath 3. + +* Thu Jul 22 2021 Fedora Release Engineering - 2.9.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 20 2021 josef radinger - 2.9.8-1 +- bump version + +* Fri Apr 09 2021 josef radinger - 2.9.7-1 +- bump version + +* Thu Feb 11 2021 josef radinger - 2.9.6-1 +- bump version + +* Tue Jan 26 2021 Fedora Release Engineering - 2.9.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 12 2021 Mamoru TASAKA - 2.9.4-5 +- Again try to build on all archs + +* Tue Jan 12 2021 Mamoru TASAKA - 2.9.4-4 +- Once make this package available on buildable arch + +* Mon Jan 04 2021 josef radinger - 2.9.4-3 +- remove stray stash file + +* Fri Jan 01 2021 Richard Shaw - 2.9.4-2 +- Rebuild for OpenEXR 2.5.3. + +* Tue Nov 24 2020 josef radinger - 2.9.4-1 +- bump version + +* Thu Nov 19 2020 josef radinger - 2.9.3-1 +- bump version + +* Thu Oct 22 2020 Nicolas Chauvet - 2.9.2-4 +- Rebuilt for OpenCV + +* Tue Sep 08 2020 josef radinger - 2.9.2-3 +- we now have desktop-files + +* Tue Sep 08 2020 josef radinger - 2.9.2-1 +- bump version + +* Sat Aug 01 2020 Fedora Release Engineering - 2.9.1-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 12 2020 josef radinger - 2.9.1-2 +- rebuild + +* Fri Jun 12 2020 josef radinger - 2.9.1-1 +- bump version +- remove patch1 (for new opencv) + +* Thu Jun 04 2020 Nicolas Chauvet - 2.9.0-4 +- Rebuilt for OpenCV 4.3 + +* Thu Apr 2 2020 josef radinger - 2.9.0-3 +- enable mtune on aarch64 + +* Thu Apr 2 2020 josef radinger - 2.9.0-2 +- disable mtune=generic for s390x, armv7hl and ppc64le + +* Mon Mar 30 2020 josef radinger - 2.9.0-1 +- bump version +- update gmic_opencv.patch + +* Thu Feb 13 2020 josef radinger - 2.8.4-1 +- bump version + +* Tue Jan 28 2020 Fedora Release Engineering - 2.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 28 2020 Nicolas Chauvet - 2.8.3-2 +- Rebuild for OpenCV 4.2 + +* Fri Jan 24 2020 josef radinger - 2.8.3-1 +- bump version + +* Wed Jan 15 2020 josef radinger - 2.8.2-1 +- bump version + +* Sun Dec 29 2019 Nicolas Chauvet - 2.7.4-4 +- Rebuilt for opencv4 + +* Fri Oct 18 2019 josef radinger - 2.7.4-3 +- add patch for building against opencv 4.1.2 + +* Fri Oct 18 2019 josef radinger - 2.7.4-2 +- rebuild against opencv 4.1.2 + +* Tue Oct 15 2019 josef radinger - 2.7.4-1 +- bump version + +* Wed Sep 11 2019 Mamoru TASAKA - 2.7.0-2 +- Rebuild for opencv (with vtk disabled) + +* Thu Aug 15 2019 josef radinger - 2.7.0-1 +- bump version + +* Thu Jul 25 2019 Fedora Release Engineering - 2.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 19 2019 josef radinger - 2.6.6-1 +- bump version + +* Tue May 28 2019 josef radinger - 2.6.4-1 +- bump version + +* Thu Apr 18 2019 josef radinger - 2.5.7-1 +- bump version + +* Thu Apr 11 2019 Richard Shaw - 2.5.6-2 +- Rebuild for OpenEXR/Ilmbase 2.3.0. +- Move licences files to %%license. + +* Mon Apr 08 2019 josef radinger - 2.5.6-1 +- bump version + +* Sat Mar 30 2019 josef radinger - 2.5.5-1 +- bump version + +* Sun Mar 24 2019 josef radinger - 2.5.4-1 +- bump version + +* Mon Mar 18 2019 Orion Poplawski - 2.5.3-2 +- Rebuild for hdf5 1.10.5 + +* Sun Mar 17 2019 josef radinger - 2.5.3-1 +- bump version +- use gmic_cluts.gmz instead of gmic_film_cluts.gmz + +* Sat Mar 16 2019 josef radinger - 2.5.2-1 +- bump version + +* Thu Jan 31 2019 Fedora Release Engineering - 2.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 21 2019 josef radinger - 2.4.5-1 +- bump version +- create %%{_sysconfdir}/bash_completion.d and move the file + +* Tue Oct 16 2018 Daniel P. Berrangé - 2.4.0-1 +- Update to 2.4.0 release + +* Tue Sep 4 2018 Daniel P. Berrangé - 2.3.6-1 +- Update to 2.3.6 release +- Drop BuildRoot and Group tags +- Use system CImg +- Update URL tag + +* Mon Jul 23 2018 Daniel P. Berrangé - 2.3.3-1 +- Updated to latest release / snapshots +- Add BR on gcc-c++ + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Mar 05 2018 Adam Williamson - 2.2.0-2 +- Rebuild for opencv soname bump + +* Thu Feb 22 2018 Daniel P. Berrange - 2.2.0-1 +- Update to new 2.2.0 upstream release +- Some parts now licensed under choice of CeCILL or CeCILL-C + +* Wed Feb 07 2018 Fedora Release Engineering - 2.1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 11 2018 Daniel P. Berrange - 2.1.8-1 +- Update to new 2.1.8 upstream release +- Remove bogus -static sub-RPM which contained shared libs + +* Thu Jan 04 2018 josef radinger - 1.7.2-6 +- Rebuilt for libopencv + +* Wed Aug 02 2017 Fedora Release Engineering - 1.7.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Mar 2 2017 Fedora Release Engineering - 1.7.2-3 +- Rebuild due to opencv soname change + +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jun 4 2016 josef radinger - 1.7.2-1 +- bump version + +* Sun May 8 2016 josef radinger - 1.7.1-2 +- rebuild for rawhide + +* Fri Apr 29 2016 josef radinger - 1.7.1-1 +- bump version +- update Patch1 +- fix link on libgmic +- remove smp_mflags (because of compile-errors) +- split a *-static package + +* Fri Feb 5 2016 josef radinger - 1.6.9-1 +- bump version +- update Patch1 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.6.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 7 2015 josef radinger - 1.6.8-1 +- bump version + +* Sat Oct 24 2015 josef radinger - 1.6.7-1 +- bump version +- new downloadurl + +* Tue Oct 13 2015 josef radinger - 1.6.6.1-1 +- bump version + +* Tue Jun 23 2015 Daniel P. Berrange - 1.6.5.0-1 +- Update to 1.6.5.0 release +- Enable zart binary build + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun May 10 2015 Daniel P. Berrange - 1.6.2.0-1 +- Update to 1.6.2.0 release + +* Sat May 02 2015 Kalev Lember - 1.6.1.0-2 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Mar 20 2015 Daniel P. Berrange - 1.6.1.0-1 +- Update to 1.6.1.0 release + +* Fri Feb 6 2015 Daniel P. Berrange - 1.6.0.4-1 +- Update to 1.6.0.4 release + +* Fri Dec 19 2014 Daniel P. Berrange - 1.6.0.3-1 +- Update to 1.6.0.3 release + +* Wed Nov 26 2014 Rex Dieter 1.6.0.1-2 +- rebuild (openexr), s|qt-devel|qt4-devel|, tighten subpkg deps + +* Fri Oct 3 2014 Daniel P. Berrange - 1.6.0.1-1 +- Update to 1.6.0.1 release + +* Mon Aug 25 2014 Daniel P. Berrange - 1.6.0.0-1 +- Update to 1.6.0.0 release + +* Sat Aug 16 2014 Fedora Release Engineering - 1.5.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Wed Jul 23 2014 Daniel P. Berrange - 1.5.9.4-1 +- Initial Fedora package after review (rhbz #1061801) diff --git a/gmic.spec b/gmic.spec index d06ab83..873b12a 100644 --- a/gmic.spec +++ b/gmic.spec @@ -1,16 +1,17 @@ -%global gimpplugindir %(gimptool --gimpplugindir)/plug-ins +%global gimpplugindir %(%___build_pre; gimptool --gimpplugindir)/plug-ins %global use_system_cimg 1 # As generated by new-snapshot.sh script -%global zart_version 20190418git51f9d2d -%global gmic_qt_version 20190418git507a40e -%global gmic_community_version 20190418git31faaa2 +%global zart_version 20231127gitd014169 +%global gmic_qt_version 20250520gitb55b8ca +%global gmic_community_version 20251227git7e21d80b Summary: GREYC's Magic for Image Computing -Name: gmic -Version: 2.5.7 -Release: 1%{?dist} +Name: gmic +Version: 3.6.6 +%global shortver %(foo=%{version}; echo ${foo//./}) +Release: %autorelease Source0: https://gmic.eu/files/source/%{name}_%{version}.tar.gz # GIT archive snapshot of https://github.com/c-koi/zart Source1: zart-%{zart_version}.tar.gz @@ -18,7 +19,8 @@ Source1: zart-%{zart_version}.tar.gz Source2: gmic-qt-%{gmic_qt_version}.tar.gz # GIT archive snapshot of https://github.com/dtschump/gmic-community Source3: gmic-community-%{gmic_community_version}.tar.gz -License: (CeCILL or CeCILL-C) and GPLv3+ + +License: ( CECILL-2.1 OR CECILL-C ) AND GPL-3.0-or-later Url: http://gmic.eu/ %if %{use_system_cimg} BuildRequires: CImg-devel == 1:%{version} @@ -29,19 +31,37 @@ BuildRequires: libtiff-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: fftw-devel +%if 0%{?fedora} > 34 +BuildRequires: openexr-devel +BuildRequires: imath-devel +%else BuildRequires: OpenEXR-devel +BuildRequires: ilmbase-devel +%endif BuildRequires: zlib-devel BuildRequires: gimp-devel-tools BuildRequires: hdf5-devel BuildRequires: opencv-devel BuildRequires: GraphicsMagick-c++-devel -BuildRequires: ilmbase-devel BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-linguist BuildRequires: libcurl-devel BuildRequires: gcc-c++ +BuildRequires: desktop-file-utils +BuildRequires: make +BuildRequires: chrpath + +Provides: bundled(zart) = %{zart_version} +Provides: bundled(gmic-qt) = %{gmic_qt_version} +Provides: bundled(gmic-community) = %{gmic_community_version} + +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + # The C library binding was mistakenly put in a -static # package despite being a shared library -Obsoletes: gmic-static <= 2.1.8 +Obsoletes: gmic-static <= 2.1.8 +# we no longer have gimp-devel-tools on s390x +ExcludeArch: s390x %description G'MIC is an open and full-featured framework for image processing, providing @@ -50,13 +70,16 @@ generic image datasets, from 1d scalar signals to 3d+t sequences of multi-spectral volumetric images. %package devel -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Summary: Development files for G'MIC %package gimp Requires: %{name}%{?_isa} = %{version}-%{release} Summary: G'MIC plugin for GIMP +%package libs +Summary: G'MIC shared libraries + %description devel G'MIC is an open and full-featured framework for image processing, providing several different user interfaces to convert/manipulate/filter/visualize @@ -73,11 +96,34 @@ multi-spectral volumetric images. Provides a plugin for using G'MIC from GIMP +%description libs +G'MIC is an open and full-featured framework for image processing, providing +several different user interfaces to convert/manipulate/filter/visualize +generic image datasets, from 1d scalar signals to 3d+t sequences of +multi-spectral volumetric images. + +Provides G'MIC shared libraries + %prep -%setup -q -a 1 -a 2 -a 3 +%setup -q -a 1 -a 3 + +# gmic bundles 'qt', but we don't assume they have the latest +# version, so remove it and provide our own +rm -rf gmic-qt +tar zxvf %{SOURCE2} + +cd gmic-qt +# no longer needed +#%%patch 1 -p1 +#%%patch 2 -p1 +#%%patch 3 -p1 + +# remove stash-file (thanks Wolfgang Lieff ) +rm -f zart/.qmake.stash %build -export CCACHE_DISABLE=1 +# ccache can be used only in local builds, koji and copr don't use it +#export CCACHE_DISABLE=1 cd src ln -fs ../gmic-community/libcgmic/gmic_libc.cpp . @@ -92,7 +138,7 @@ mv CImg.h CImg.h.bak cp /usr/include/CImg.h CImg.h %endif -make OPT_CFLAGS="%{optflags} -g" NOSTRIP=1 cli lib libc +make OPT_CFLAGS="%{optflags} -g" NOSTRIP=1 PREFIX=%{_prefix} LIB=%{_lib} cli lib libc cd ../gmic-qt %{qmake_qt5} CONFIG+=release GMIC_PATH=../src HOST=gimp gmic_qt.pro && %{make_build} @@ -110,19 +156,10 @@ 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 install +make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIB=%{_lib} install -# Makefile is not multilib aware -if test "%{_prefix}/lib" != "%{_libdir}" -then - mv $RPM_BUILD_ROOT/%{_prefix}/lib/* $RPM_BUILD_ROOT/%{_libdir}/ -fi - -# Makefile creates too many intermediate symlinks for the library -rm -f $RPM_BUILD_ROOT/%{_libdir}/libgmic.so.2 -rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgmic.so.2 -ln -s libgmic.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libgmic.so.2 -ln -s libcgmic.so.%{version} $RPM_BUILD_ROOT/%{_libdir}/libcgmic.so.2 +desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/gmic_qt.desktop +desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/zart.desktop mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d mv $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/gmic $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic @@ -131,7 +168,60 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/bash-completion/completions/ # Sourced files shouldn't be executable chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic -%ldconfig_scriptlets +# remove rpaths +chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gmic +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcgmic.so.%{shortver} +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgmic.so.%{shortver} + +%ldconfig_scriptlets libs + +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +# Handle upgrades across the Gimp 3 transition, which required +# moving the plugin into a sub-directory. +# +# 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}/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 || : %files %doc README @@ -140,10 +230,14 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{_bindir}/gmic_qt %{_bindir}/zart %{_sysconfdir}/bash_completion.d/gmic -%{_libdir}/libgmic.so.* -%{_libdir}/libcgmic.so.* %{_mandir}/man1/%{name}.1.gz %{_mandir}/fr/man1/%{name}.1.gz +%{_datadir}/applications/gmic_qt.desktop +%{_datadir}/applications/zart.desktop +%{_datadir}/icons/hicolor/48x48/apps/gmic_qt.png +%{_datadir}/icons/hicolor/48x48/apps/zart.png +%{_datadir}/icons/hicolor/scalable/apps/gmic_qt.svg +%{_datadir}/icons/hicolor/scalable/apps/zart.svg %files devel %{_prefix}/include/gmic.h @@ -152,151 +246,22 @@ chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/gmic %{_libdir}/libcgmic.so %files gimp +%dir %{gimpplugindir} %{gimpplugindir}/gmic_gimp_qt -%{gimpplugindir}/gmic_cluts.gmz +# 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 +%{_datadir}/gmic/gmic_fonts.gmz +%{_datadir}/gmic/gmic_lightleaks.gmz +%{_datadir}/gmic/gmic_scale2x_cnn.gmz + +%files libs +%license COPYING COPYING-libcgmic +%{_libdir}/libgmic.so.3* +%{_libdir}/libcgmic.so.3* %changelog -* Thu Apr 18 2019 josef radinger - 2.5.7-1 -- bump version - -* Thu Apr 11 2019 Richard Shaw - 2.5.6-2 -- Rebuild for OpenEXR/Ilmbase 2.3.0. -- Move licences files to %%license. - -* Mon Apr 08 2019 josef radinger - 2.5.6-1 -- bump version - -* Sat Mar 30 2019 josef radinger - 2.5.5-1 -- bump version - -* Sun Mar 24 2019 josef radinger - 2.5.4-1 -- bump version - -* Mon Mar 18 2019 Orion Poplawski - 2.5.3-2 -- Rebuild for hdf5 1.10.5 - -* Sun Mar 17 2019 josef radinger - 2.5.3-1 -- bump version -- use gmic_cluts.gmz instead of gmic_film_cluts.gmz - -* Sat Mar 16 2019 josef radinger - 2.5.2-1 -- bump version - -* Thu Jan 31 2019 Fedora Release Engineering - 2.4.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 21 2019 josef radinger - 2.4.5-1 -- bump version -- create %%{_sysconfdir}/bash_completion.d and move the file - -* Tue Oct 16 2018 Daniel P. Berrangé - 2.4.0-1 -- Update to 2.4.0 release - -* Tue Sep 4 2018 Daniel P. Berrangé - 2.3.6-1 -- Update to 2.3.6 release -- Drop BuildRoot and Group tags -- Use system CImg -- Update URL tag - -* Mon Jul 23 2018 Daniel P. Berrangé - 2.3.3-1 -- Updated to latest release / snapshots -- Add BR on gcc-c++ - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Mar 05 2018 Adam Williamson - 2.2.0-2 -- Rebuild for opencv soname bump - -* Thu Feb 22 2018 Daniel P. Berrange - 2.2.0-1 -- Update to new 2.2.0 upstream release -- Some parts now licensed under choice of CeCILL or CeCILL-C - -* Wed Feb 07 2018 Fedora Release Engineering - 2.1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 11 2018 Daniel P. Berrange - 2.1.8-1 -- Update to new 2.1.8 upstream release -- Remove bogus -static sub-RPM which contained shared libs - -* Thu Jan 04 2018 josef radinger - 1.7.2-6 -- Rebuilt for libopencv - -* Wed Aug 02 2017 Fedora Release Engineering - 1.7.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.7.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Mar 2 2017 Fedora Release Engineering - 1.7.2-3 -- Rebuild due to opencv soname change - -* Fri Feb 10 2017 Fedora Release Engineering - 1.7.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jun 4 2016 josef radinger - 1.7.2-1 -- bump version - -* Sun May 8 2016 josef radinger - 1.7.1-2 -- rebuild for rawhide - -* Fri Apr 29 2016 josef radinger - 1.7.1-1 -- bump version -- update Patch1 -- fix link on libgmic -- remove smp_mflags (because of compile-errors) -- split a *-static package - -* Fri Feb 5 2016 josef radinger - 1.6.9-1 -- bump version -- update Patch1 - -* Wed Feb 03 2016 Fedora Release Engineering - 1.6.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Dec 7 2015 josef radinger - 1.6.8-1 -- bump version - -* Sat Oct 24 2015 josef radinger - 1.6.7-1 -- bump version -- new downloadurl - -* Tue Oct 13 2015 josef radinger - 1.6.6.1-1 -- bump version - -* Tue Jun 23 2015 Daniel P. Berrange - 1.6.5.0-1 -- Update to 1.6.5.0 release -- Enable zart binary build - -* Wed Jun 17 2015 Fedora Release Engineering - 1.6.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun May 10 2015 Daniel P. Berrange - 1.6.2.0-1 -- Update to 1.6.2.0 release - -* Sat May 02 2015 Kalev Lember - 1.6.1.0-2 -- Rebuilt for GCC 5 C++11 ABI change - -* Fri Mar 20 2015 Daniel P. Berrange - 1.6.1.0-1 -- Update to 1.6.1.0 release - -* Fri Feb 6 2015 Daniel P. Berrange - 1.6.0.4-1 -- Update to 1.6.0.4 release - -* Fri Dec 19 2014 Daniel P. Berrange - 1.6.0.3-1 -- Update to 1.6.0.3 release - -* Wed Nov 26 2014 Rex Dieter 1.6.0.1-2 -- rebuild (openexr), s|qt-devel|qt4-devel|, tighten subpkg deps - -* Fri Oct 3 2014 Daniel P. Berrange - 1.6.0.1-1 -- Update to 1.6.0.1 release - -* Mon Aug 25 2014 Daniel P. Berrange - 1.6.0.0-1 -- Update to 1.6.0.0 release - -* Sat Aug 16 2014 Fedora Release Engineering - 1.5.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Jul 23 2014 Daniel P. Berrange - 1.5.9.4-1 -- Initial Fedora package after review (rhbz #1061801) +%autochangelog diff --git a/new-snapshot.sh b/new-snapshot.sh index 712bcf7..b9b9c73 100755 --- a/new-snapshot.sh +++ b/new-snapshot.sh @@ -16,9 +16,8 @@ function archive_it() { git clone $uri fi - DATE=`date +"%Y%m%d"` - cd $name + DATE=$(git log -1 --format=%cd --date=short | tr -d \-) HASH=`git rev-parse --short HEAD` FILE=${name}-${DATE}git${HASH}.tar.gz @@ -33,7 +32,7 @@ function print_hash() { cd $name HASH=`git rev-parse --short HEAD` - today=`date +"%Y%m%d"` + today=$(git log -1 --format=%cd --date=short | tr -d \-) macro=`echo $name | sed -e 's/-/_/g'` echo "%global ${macro}_version ${today}git${HASH}" @@ -41,7 +40,8 @@ function print_hash() { } archive_it zart https://github.com/c-koi/zart . -archive_it gmic-qt https://github.com/c-koi/gmic-qt . +#archive_it gmic-qt https://github.com/c-koi/gmic-qt . +archive_it gmic-qt https://github.com/GreycLab/gmic-qt.git . archive_it gmic-community https://github.com/dtschump/gmic-community libcgmic print_hash zart diff --git a/sources b/sources index 1d9a8d6..bae85e9 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gmic-community-20190418git31faaa2.tar.gz) = 16ab43d1855ec7c12e8e9eb41b17271428669388135e7ffc7e06ea2761f9f940400fbeb9f909826b091c371a806ed7e0eec683a7aee2b55fd0938f71b5c0b56f -SHA512 (gmic-qt-20190418git507a40e.tar.gz) = 03b7b7108f4551ab1928cd4c71d6fbee53608cba9432d4d11915ca6315a2ca2d226949855c3ba321fe3e0b2293e7b2cfcf6686c066b8318720f6527d396e9a0d -SHA512 (zart-20190418git51f9d2d.tar.gz) = b9405fe8a9700b73abe89fd80c4e45426abbf3fcde5ed3dd8201e2535cdcd3eac5475d40b6c6e34260fd7e47257e78ce2f757fbfb0d4952182114550531180c3 -SHA512 (gmic_2.5.7.tar.gz) = cab58245050e47b12b2759a4e928aa30739eccfff6eb07ae60e848e706997317f32111b31cbb0b179c331215875aa2a37e2b133925a24de5ab9903882ad70ba8 +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