- updated to 0.1.78

- removed outdated mrg patch, now upstream matches mrg 0.1.4+ includes

diff --git a/gegl-mrg.patch b/gegl-mrg.patch
deleted file mode 100644 (file)
index a7725f2..0000000
--- a/gegl-mrg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- gegl-0.4.18/bin/argvs.c.orig       2019-10-27 01:01:07.000000000 +0200
-+++ gegl-0.4.18/bin/argvs.c    2019-12-01 20:46:00.605726065 +0100
-@@ -25,8 +25,8 @@
- 
- 
- #ifdef MRG_PRINTF
--#include <mrg.h>
--#include <mrg-string.h>
-+#include <mrg/mrg.h>
-+#include <mrg/mrg-string.h>
- extern Mrg *mrg;
- extern MrgList *scrollback;
- extern int use_ui;
---- gegl-0.4.18/bin/mrg-gegl.c.orig    2019-10-27 01:01:07.000000000 +0200
-+++ gegl-0.4.18/bin/mrg-gegl.c 2019-12-01 20:53:41.246563892 +0100
-@@ -36,7 +36,7 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <math.h>
--#include <mrg.h>
-+#include <mrg/mrg.h>
- #include <gegl.h>
- #include <gexiv2/gexiv2.h>
- #include <gegl-paramspecs.h>
---- gegl-0.4.18/bin/ui-collection.c.orig       2019-10-27 01:01:07.000000000 +0200
-+++ gegl-0.4.18/bin/ui-collection.c    2019-12-01 20:53:51.686507334 +0100
-@@ -25,8 +25,8 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <math.h>
--#include <mrg.h>
--#include <mrg-string.h>
-+#include <mrg/mrg.h>
-+#include <mrg/mrg-string.h>
- #include <gegl.h>
- #include <gexiv2/gexiv2.h>
- #include <gegl-paramspecs.h>
---- gegl-0.4.18/bin/ui-core.c.orig     2019-10-27 01:01:07.000000000 +0200
-+++ gegl-0.4.18/bin/ui-core.c  2019-12-01 20:53:58.173138860 +0100
-@@ -107,8 +107,8 @@ const char *css =
- #include <unistd.h>
- #include <dirent.h>
- #include <math.h>
--#include <mrg.h>
--#include <mrg-string.h>
-+#include <mrg/mrg.h>
-+#include <mrg/mrg-string.h>
- #include <gegl.h>
- #include <gexiv2/gexiv2.h>
- #include <gegl-paramspecs.h>
---- gegl-0.4.18/bin/ui-viewer.c.orig   2019-10-27 01:01:07.000000000 +0200
-+++ gegl-0.4.18/bin/ui-viewer.c        2019-12-01 20:54:06.116429161 +0100
-@@ -24,8 +24,8 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <math.h>
--#include <mrg.h>
--#include <mrg-string.h>
-+#include <mrg/mrg.h>
-+#include <mrg/mrg-string.h>
- #include <gegl.h>
- #include <gexiv2/gexiv2.h>
- #include <gegl-paramspecs.h>

diff --git a/gegl.spec b/gegl.spec
index 9d7f486247672b94896aeb2b1912961c0302f475..53451d932da2bb10ec55c8fc0608609fc40f4198 100644 (file)
--- a/gegl.spec
+++ b/gegl.spec
@@ -14,19 +14,18 @@
 %undefine      with_lua
 %endif
 
-%define        babl_version    0.1.74
-%define        mrg_version     0.1.2-1.20190322.1
+%define        babl_version    0.1.78
+%define        mrg_version     0.1.4
 
 Summary:       Generic image processing library
 Summary(pl.UTF-8):     Ogólna biblioteka przetwarzania obrazu
 Name:          gegl
-Version:       0.4.22
+Version:       0.4.26
 Release:       1
 License:       LGPL v3+/GPL v3+
 Group:         Libraries
 Source0:       https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.xz
-# Source0-md5: 1776ac26792de0de3c3d680872e94b72
-Patch0:                %{name}-mrg.patch
+# Source0-md5: 4756ac2a8cfca8591f12dbf3f6701b14
 Patch1:                %{name}-ruby1.9.patch
 Patch2:                %{name}-build.patch
 Patch3:                umfpack.patch
@@ -158,7 +157,7 @@ Summary:    gegl library API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki gegl
 Group:         Documentation
 Requires:      gtk-doc-common
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
 %endif
 
@@ -173,7 +172,7 @@ Summary:    Vala API for gegl library
 Summary(pl.UTF-8):     API języka Vala dla biblioteki gegl
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
 %endif
 
@@ -185,7 +184,6 @@ API języka Vala dla biblioteki gegl.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -202,6 +200,10 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/umfpack"
 
 %ninja_build -C build
 
+rmdir build/docs/operations/RAM
+# possible gegl-tester coredumps?
+rm -f build/docs/operations/core*
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -252,7 +254,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with doc}
 %files apidocs
 %defattr(644,root,root,755)
-%doc build/docs/{ophtml,*.html,*.png}
+%doc build/docs/{operations,*.html,*.png}
 %{_gtkdocdir}/gegl
 %endif