From 60efbdbc9b1baf5017cd4eb95ce887ce4a9cb9a8 Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 1 Jan 2025 22:16:10 +0300 Subject: [PATCH] import gegl04-0.4.48-4.el10 --- .gegl04.metadata | 2 +- .gitignore | 2 +- SOURCES/gegl04-meson.patch | 21 ---- SPECS/gegl04.spec | 208 ++++++++++++++++++------------------- 4 files changed, 103 insertions(+), 130 deletions(-) delete mode 100644 SOURCES/gegl04-meson.patch diff --git a/.gegl04.metadata b/.gegl04.metadata index a60a983..e4b6a11 100644 --- a/.gegl04.metadata +++ b/.gegl04.metadata @@ -1 +1 @@ -055c28bb3c942f85b744201009ac8e02e4182624 SOURCES/gegl-0.4.34.tar.xz +d051906c8339e1913a30a379ee5a86bf6e76ddf8 SOURCES/gegl-0.4.48.tar.xz diff --git a/.gitignore b/.gitignore index 1e871c5..62ddeeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gegl-0.4.34.tar.xz +SOURCES/gegl-0.4.48.tar.xz diff --git a/SOURCES/gegl04-meson.patch b/SOURCES/gegl04-meson.patch deleted file mode 100644 index 1248158..0000000 --- a/SOURCES/gegl04-meson.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up gegl-0.4.34/gegl/meson.build.orig gegl-0.4.34/gegl/meson.build ---- gegl-0.4.34/gegl/meson.build.orig 2022-11-04 14:51:55.429964084 +0100 -+++ gegl-0.4.34/gegl/meson.build 2022-11-04 14:52:57.611332244 +0100 -@@ -92,8 +92,7 @@ install_headers(gegl_headers, - gegl_ldflags = os_osx ? ['-framework', 'OpenCL'] : [] - - opencl_dep = declare_dependency( -- sources : [opencl_headers], -- link_with : [gegl_sources], -+ sources : [opencl_headers], - ) - - gegl_lib = library(api_name, -@@ -105,6 +104,7 @@ gegl_lib = library(api_name, - gio, - math, - gmodule, -+ opencl_dep, - ], - c_args: gegl_cflags, - link_args: gegl_ldflags, diff --git a/SPECS/gegl04.spec b/SPECS/gegl04.spec index 0ff27d1..319800b 100644 --- a/SPECS/gegl04.spec +++ b/SPECS/gegl04.spec @@ -1,20 +1,37 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 4; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + %global apiver 0.4 +%if 0%{?rhel} +%bcond lensfun 0 +%else +%bcond lensfun 1 +%endif + +# Disable docs until https://gitlab.gnome.org/GNOME/gegl/-/issues/363 is fixed +# Due to babl update +%bcond docs 0 + Name: gegl04 -Version: 0.4.34 -Release: 2%{?dist} +Version: 0.4.48 +Release: %autorelease Summary: Graph based image processing framework # The binary is under the GPL, while the libs are under LGPL. -# The main package only installs the libs, which makes the license: -License: LGPLv3+ -URL: http://www.gegl.org/ +License: GPL-3.0-or-later AND LGPL-3.0-or-later +URL: https://www.gegl.org/ Source0: http://download.gimp.org/pub/gegl/%{apiver}/gegl-%{version}.tar.xz Patch0: gegl04-openexr.patch Patch1: gegl04-gtk.patch -# https://gitlab.gnome.org/GNOME/gegl/-/commit/54f760de6a0e14487ccfb033e270aa6a80ee66e2 -Patch2: gegl04-meson.patch BuildRequires: chrpath BuildRequires: enscript @@ -28,8 +45,9 @@ BuildRequires: perl-interpreter BuildRequires: ruby BuildRequires: suitesparse-devel BuildRequires: vala +BuildRequires: asciidoc -BuildRequires: pkgconfig(babl) >= 0.1.78 +BuildRequires: pkgconfig(babl-0.1) >= 0.1.100 BuildRequires: pkgconfig(cairo) >= 1.12.2 BuildRequires: pkgconfig(exiv2) >= 0.25 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.32.0 @@ -38,6 +56,9 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 BuildRequires: pkgconfig(jasper) >= 1.900.1 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(lcms2) >= 2.8 +%if %{with lensfun} +BuildRequires: pkgconfig(lensfun) >= 0.2.5 +%endif BuildRequires: pkgconfig(libraw) >= 0.15.4 BuildRequires: pkgconfig(libpng) >= 1.6.0 BuildRequires: pkgconfig(librsvg-2.0) >= 2.40.6 @@ -91,6 +112,7 @@ The %{name}-devel package contains libraries and header files for developing applications that use GEGL API version %{apiver}. +%if %{with docs} %package devel-docs Summary: Documentation files for developing with %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -102,12 +124,12 @@ Conflicts: gegl-devel < 0.4 %description devel-docs The %{name}-devel-docs package contains documentation files for developing applications that use GEGL API version %{apiver}. +%endif %package tools Summary: Command line tools for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -License: GPLv3+ Obsoletes: gegl03-tools < 0.3.31 Conflicts: gegl < 0.4 @@ -121,7 +143,7 @@ GEGL library. %build -%meson --auto-features=auto -Ddocs=true -Dgtk-doc=true +%meson --auto-features=auto %{!?with_docs:-Ddocs=false -Dgtk-doc=false}%{?with_docs:-Ddocs=true -Dgtk-doc=true} %meson_build @@ -166,8 +188,10 @@ chrpath --delete %{buildroot}%{_libdir}/gegl-%{apiver}/*.so %{_datadir}/vala/vapi/gegl-%{apiver}.deps %{_datadir}/vala/vapi/gegl-%{apiver}.vapi +%if %{with docs} %files devel-docs %doc %{_datadir}/gtk-doc/ +%endif %files tools %license COPYING @@ -175,131 +199,101 @@ chrpath --delete %{buildroot}%{_libdir}/gegl-%{apiver}/*.so %changelog -* Fri Nov 04 2022 Tomas Popela - 0.4.34-2 -- Fix FTBFS for a possible Meson rebase -- Resolves: rhbz#2140107 - -* Wed Feb 02 2022 Josef Ridky - 0.4.34-1 -- New upstream release 0.4.34 (#2045018) -- Fix CVE-2021-45463 - -* Mon Aug 09 2021 Mohan Boddu - 0.4.30-5 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 - -* Wed Jun 30 2021 Josef Ridky - 0.4.30-4 -- Remove lensfun from buildrequires (#1975916) +* Wed Jan 01 2025 Arkady L. Shane - 0.4.48-4 +- Rebuilt for MSVSphere 10 -* Fri Apr 16 2021 Debarshi Ray - 0.4.30-3 -- Disable luajit on RHEL -Resolves: #1950052 - -* Thu Apr 15 2021 Mohan Boddu - 0.4.30-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - -* Fri Apr 02 2021 Kalev Lember - 0.4.30-1 -- Update to 0.4.30 +## START: Generated by rpmautospec +* Thu Jul 18 2024 Fedora Release Engineering - 0.4.48-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild -* Thu Jan 28 2021 Josef Ridky - 0.4.26-4 -- Disable OpenEXR on RHEL +* Mon Jul 01 2024 Robert-André Mauchin - 0.4.48-3 +- Disable docs to fix FTBFS +- Rebuilt for exiv2 0.28.2 -* Tue Jan 26 2021 Fedora Release Engineering - 0.4.26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Mon Apr 22 2024 Josef Řídký - 0.4.48-2 +- Rebuild for new openexr -* Fri Jan 01 2021 Richard Shaw - 0.4.26-2 -- Rebuild for OpenEXR 2.5.3. +* Tue Feb 13 2024 Josef Řídký - 0.4.48-1 +- New upstream release 0.4.48 (#2263786) -* Mon Aug 24 2020 Josef Ridky - 0.4.26-1 -- New upstream release 0.4.26 +* Sun Feb 04 2024 Orion Poplawski - 0.4.46-6 +- Rebuild with suitesparse 7.6.0 -* Mon Jul 27 2020 Fedora Release Engineering - 0.4.24-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Wed Jan 24 2024 Fedora Release Engineering - 0.4.46-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Mon Jun 15 2020 Josef Ridky - 0.4.24-1 -- New upstream release 0.4.24 +* Fri Jan 19 2024 Fedora Release Engineering - 0.4.46-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Mon May 11 2020 Gwyn Ciesla - 0.4.22-2 -- Rebuild for new LibRaw +* Tue Nov 28 2023 Orion Poplawski - 0.4.46-3 +- Rebuild for jasper 4.1 -* Wed Feb 19 2020 Josef Ridky - 0.4.22-1 -- Update to 0.4.22 +* Fri Nov 10 2023 Jiri Kucera - 0.4.46-2 +- Drop lensfun on RHEL -* Tue Jan 28 2020 Fedora Release Engineering - 0.4.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Aug 29 2023 Nils Philippsen - 0.4.46-1 +- New upstream release 0.4.46 -* Mon Nov 04 2019 Kalev Lember - 0.4.18-1 -- Update to 0.4.18 -- Switch to meson build system -- Build against SDL2 instead of SDL 1 -- Enable gexiv2 support +* Wed Jul 19 2023 Fedora Release Engineering - 0.4.44-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -* Thu Sep 12 2019 Josef Ridky -0.4.16-4 -- Obsoletes gegl03 (#1751416) +* Thu Mar 30 2023 David King - 0.4.44-2 +- Build against newer babl releases -* Tue Aug 27 2019 Kevin Fenzi - 0.4.16-3 -- Rebuild for new libspiro +* Mon Mar 27 2023 Josef Řídký - 0.4.44-1 +- Resolves: #2142383 - new upstream release 0.4.44 -* Thu Jul 25 2019 Fedora Release Engineering - 0.4.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Thu Jan 19 2023 Fedora Release Engineering - 0.4.38-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Mon Jun 10 2019 Kalev Lember - 0.4.16-1 -- Update to 0.4.16 +* Tue Dec 20 2022 Gwyn Ciesla - 0.4.38-3 +- Patch for api change. -* Wed Apr 10 2019 Richard Shaw - 0.4.14-2 -- Rebuild for OpenEXR 2.3.0. +* Tue Dec 20 2022 Gwyn Ciesla - 0.4.38-2 +- LibRaw rebuild -* Mon Mar 25 2019 Josef Ridky - 0.4.14-1 -- version 0.4.14 +* Mon Aug 01 2022 Josef Řídký - 0.4.38-1 +- New upstream release 0.4.38 -* Mon Feb 04 2019 Kalev Lember - 0.4.12-3 -- Update BRs for vala packaging changes +* Thu Jul 21 2022 Fedora Release Engineering - 0.4.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Thu Jan 31 2019 Fedora Release Engineering - 0.4.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Mon Mar 14 2022 Josef Řídký - 0.4.36-1 +- New upstream release 0.4.36 -* Sat Nov 10 2018 Nils Philippsen - 0.4.12-1 -- version 0.4.12 +* Sun Feb 13 2022 Josef Řídký - 0.4.34-4 +- Rebuilt for libjasper.so.6 -* Fri Aug 24 2018 Debarshi Ray - 0.4.8-2 -- Drop the run-time requirement on ImageMagick +* Sun Feb 13 2022 Josef Řídký - 0.4.34-3 +- Rebuild for new jasper library -* Mon Aug 20 2018 Nils Philippsen - 0.4.8-1 -- version 0.4.8 +* Thu Jan 20 2022 Fedora Release Engineering - 0.4.34-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Thu Jul 19 2018 Christian Dersch - 0.4.4-3 -- Rebuilt for LibRaw soname bump +* Tue Jan 04 2022 Josef Řídký - 0.4.34-1 +- Resolves: #2035384 - fix CVE-2021-45463 -* Fri Jul 13 2018 Fedora Release Engineering - 0.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Mon Oct 18 2021 Josef Řídký - 0.4.32-1 +- New upstream release -* Thu Jul 05 2018 Nils Philippsen - 0.4.4-1 -- version 0.4.4 +* Sat Aug 21 2021 Richard Shaw - 0.4.30-6 +- Rebuild for OpenEXR/Imath 3.1. -* Mon May 21 2018 Nils Philippsen - 0.4.2-2 -- split off devel docs -- let gegl04-devel-docs explicitly conflict with old gegl-devel (#1577595) +* Mon Aug 02 2021 Richard Shaw - 0.4.30-5 +- Rebuild for OpenEXR 3. -* Mon May 21 2018 Nils Philippsen - 0.4.2-1 -- version 0.4.2 +* Thu Jul 22 2021 Fedora Release Engineering - 0.4.30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Wed May 02 2018 Nils Philippsen - 0.4.0-2 -- don't require asciidoc for building -- always install unversioned executables +* Sun Jun 06 2021 Richard Shaw - 0.4.30-3 +- Add missing openexr header to support future openexr 3.0 build. -* Sat Apr 28 2018 Nils Philippsen - 0.4.0-1 -- import into Fedora dist-git - -* Fri Apr 27 2018 Nils Philippsen - 0.4.0-0.4 -- own all created directories -- remove rpaths - -* Fri Apr 27 2018 Nils Philippsen - 0.4.0-0.3 -- use %%ldconfig_scriptlets macro +* Thu Apr 15 2021 Debarshi Ray - 0.4.30-2 +- Disable luajit on RHEL -* Fri Apr 27 2018 Nils Philippsen - 0.4.0-0.2 -- add tools subpackage -- tidy up remains of 0.3 -- add back gtk-doc documentation +* Fri Apr 02 2021 Kalev Lember - 0.4.30-1 +- Update to 0.4.30 -* Fri Apr 27 2018 Nils Philippsen - 0.4.0-0.1 -- initial import +* Thu Jan 28 2021 Josef Řídký - 0.4.26-4 +- RPMAUTOSPEC: unresolvable merge +## END: Generated by rpmautospec