diff --git a/gmic.changes b/gmic.changes index 4718851..1de2922 100644 --- a/gmic.changes +++ b/gmic.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 23 11:41:08 UTC 2019 - Christophe Giboudeaux + +- Update to 2.7.2. No changelog available +- Enable the digikam plugin + ------------------------------------------------------------------- Sun Sep 8 19:29:39 UTC 2019 - Christophe Giboudeaux diff --git a/gmic.spec b/gmic.spec index affe0a9..24cf029 100644 --- a/gmic.spec +++ b/gmic.spec @@ -29,7 +29,7 @@ %bcond_with opencv %endif Name: gmic -Version: 2.7.1 +Version: 2.7.2 Release: 0 Summary: GREYC's Magick for Image Computing (denoise and others) # gmic-qt is GPL-3.0-or-later, zart is CECILL-2.0, libgmic and cli program are @@ -44,10 +44,9 @@ BuildRequires: cmake > 3.8 BuildRequires: fftw3-threads-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files -# Not available yet -# %%if %%{with digikam_plugin} -# BuildRequires: cmake(DigikamCore) >= 6.3.0 -# %%endif +%if %{with digikam_plugin} +BuildRequires: cmake(DigikamCore) >= 6.3.0 +%endif BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5LinguistTools) @@ -120,16 +119,16 @@ Requires: krita %description -n krita-plugin-gmic This is a plugin for krita to provide gmic features. -# %%if %%{with digikam_plugin} -# %%package -n digikam-plugin-gmic -# Summary: GMIC plugin for digikam -# License: GPL-3.0-or-later -# Group: Productivity/Graphics/Bitmap Editors -# Requires: digikam -# -# %%description -n digikam-plugin-gmic -# This is a plugin for digikam to provide gmic features. -# %%endif +%if %{with digikam_plugin} +%package -n digikam-plugin-gmic +Summary: GMIC plugin for digikam +License: GPL-3.0-or-later +Group: Productivity/Graphics/Bitmap Editors +Requires: digikam + +%description -n digikam-plugin-gmic +This is a plugin for digikam to provide gmic features. +%endif %package zart Summary: GMIC GUI for video streams @@ -183,16 +182,16 @@ cd .. cd .. -# %%if %%{with digikam_plugin} -# %%cmake \ -# -DENABLE_DYNAMIC_LINKING=ON \ -# -DGMIC_PATH=%%{_builddir}/%%{name}-%%{version}/src \ -# -DGMIC_LIB_PATH=%%{_builddir}/%%{name}-%%{version}/build \ -# -DGMIC_QT_HOST=digikam -# %%cmake_build -# -# cd .. -# %%endif +%if %{with digikam_plugin} +%cmake \ + -DENABLE_DYNAMIC_LINKING=ON \ + -DGMIC_PATH=%{_builddir}/%{name}-%{version}/src \ + -DGMIC_LIB_PATH=%{_builddir}/%{name}-%{version}/build \ + -DGMIC_QT_HOST=digikam +%cmake_build + +cd .. +%endif %cmake \ -DENABLE_DYNAMIC_LINKING=ON \ @@ -239,13 +238,13 @@ install -m 0755 build/gmic_krita_qt %{buildroot}%{_bindir}/gmic_krita_qt # gimp plugin install -d -m 0755 %{buildroot}%{_gimpplugindir} install -m 0755 build/gmic_gimp_qt %{buildroot}%{_gimpplugindir}/gmic_gimp_qt -popd -# %%if %%{with digikam_plugin} -# # digikam plugin -# install -d -m 0755 %%{buildroot}%%{_libqt5_plugindir}/digikam/editor -# install -m 0755 build/Editor_GmicQt_Plugin.so %%{buildroot}%%{_libqt5_plugindir}/digikam/editor/Editor_GmicQt_Plugin.so -# %%endif +%if %{with digikam_plugin} +# digikam plugin +install -d -m 0755 %{buildroot}%{_libqt5_plugindir}/digikam/editor +install -m 0755 build/Editor_GmicQt_Plugin.so %{buildroot}%{_libqt5_plugindir}/digikam/editor/Editor_GmicQt_Plugin.so +%endif +popd %if %{with opencv} # zart @@ -283,13 +282,13 @@ popd %license COPYING %{_bindir}/gmic_krita_qt -# %%if %%{with digikam_plugin} -# %%files -n digikam-plugin-gmic -# %%license COPYING -# %%dir %%{_libqt5_plugindir}/digikam -# %%dir %%{_libqt5_plugindir}/digikam/editor -# %%{_libqt5_plugindir}/digikam/editor/Editor_GmicQt_Plugin.so -# %%endif +%if %{with digikam_plugin} +%files -n digikam-plugin-gmic +%license COPYING +%dir %{_libqt5_plugindir}/digikam +%dir %{_libqt5_plugindir}/digikam/editor +%{_libqt5_plugindir}/digikam/editor/Editor_GmicQt_Plugin.so +%endif %files -n libgmic1 %license COPYING diff --git a/gmic_2.7.1.tar.gz b/gmic_2.7.1.tar.gz deleted file mode 100644 index c907286..0000000 --- a/gmic_2.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c71e784abd2141252efad505b6a48b6974c388788db5530b3ca0dfb07baeafeb -size 5843308 diff --git a/gmic_2.7.2.tar.gz b/gmic_2.7.2.tar.gz new file mode 100644 index 0000000..995db3e --- /dev/null +++ b/gmic_2.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9b8ed8866c6c5cc509c6bd57ada2e2dcf7d4be48e3b33fd55b2c9e8c9d4d45f +size 5848087