From e42dacd8102a1d49193d76c4339b188e6b0e6a39435034f48a6ed2198161f74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sun, 4 Aug 2019 12:09:17 +0000 Subject: [PATCH] Accepting request 720831 from home:StefanBruens:branches:graphics Reduce installed build dependencies OBS-URL: https://build.opensuse.org/request/show/720831 OBS-URL: https://build.opensuse.org/package/show/graphics/gegl?expand=0&rev=76 --- fix_doc_installation.patch | 68 ++++++++++++++++++++++++++++++++++++++ gegl.changes | 8 +++++ gegl.spec | 5 ++- 3 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 fix_doc_installation.patch diff --git a/fix_doc_installation.patch b/fix_doc_installation.patch new file mode 100644 index 0000000..b4a3684 --- /dev/null +++ b/fix_doc_installation.patch @@ -0,0 +1,68 @@ +--- gegl-0.4.16/docs/Makefile.am_orig 2019-08-03 21:46:35.325046055 +0200 ++++ gegl-0.4.16/docs/Makefile.am 2019-08-03 23:23:17.090023165 +0200 +@@ -27,7 +27,6 @@ + HTML_FILES += images/inheritance.png + endif + +-if HAVE_ENSCRIPT + ENSCRIPT_FILES = \ + brightness-contrast.c.html \ + gegl.h.html \ +@@ -50,7 +49,6 @@ + + HTML_FILES += $(ENSCRIPT_FILES) + GTKDOC_FILES += $(ENSCRIPT_FILES) +-endif + + if HAVE_ASCIIDOC + HTML_FILES += $(ASC_DOC) +--- gegl-0.4.16/docs/Makefile.in_orig 2019-05-07 23:50:15.000000000 +0200 ++++ gegl-0.4.16/docs/Makefile.in 2019-08-03 23:23:30.654194341 +0200 +@@ -97,8 +97,8 @@ + host_triplet = @host@ + target_triplet = @target@ + @HAVE_RUBY_TRUE@am__append_1 = images/inheritance.png +-@HAVE_ENSCRIPT_TRUE@am__append_2 = $(ENSCRIPT_FILES) +-@HAVE_ENSCRIPT_TRUE@am__append_3 = $(ENSCRIPT_FILES) ++am__append_2 = $(ENSCRIPT_FILES) ++am__append_3 = $(ENSCRIPT_FILES) + @HAVE_ASCIIDOC_TRUE@am__append_4 = $(ASC_DOC) + subdir = docs + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -458,21 +458,21 @@ + HTML_FILES = class-hierarchy.html $(am__append_1) $(am__append_2) \ + $(am__append_4) + GTKDOC_FILES = gegl.css $(am__append_3) +-@HAVE_ENSCRIPT_TRUE@ENSCRIPT_FILES = \ +-@HAVE_ENSCRIPT_TRUE@ brightness-contrast.c.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-filter.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-composer.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-area-filter.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-meta.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-point-composer.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-point-filter.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-point-render.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-temporal.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-sink.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-operation-source.h.html \ +-@HAVE_ENSCRIPT_TRUE@ gegl-plugin.h.html ++ENSCRIPT_FILES = \ ++ brightness-contrast.c.html \ ++ gegl.h.html \ ++ gegl-operation.h.html \ ++ gegl-operation-filter.h.html \ ++ gegl-operation-composer.h.html \ ++ gegl-operation-area-filter.h.html \ ++ gegl-operation-meta.h.html \ ++ gegl-operation-point-composer.h.html \ ++ gegl-operation-point-filter.h.html \ ++ gegl-operation-point-render.h.html \ ++ gegl-operation-temporal.h.html \ ++ gegl-operation-sink.h.html \ ++ gegl-operation-source.h.html \ ++ gegl-plugin.h.html + + EXTRA_DIST = ChangeLog development.txt NEWS.txt devhelp.css gegl.css \ + images/GEGL.png images/GEGL.svg images/gaussian-blur-graph.png \ diff --git a/gegl.changes b/gegl.changes index d8d10b2..6c2d616 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Aug 3 19:08:48 UTC 2019 - Stefan Brüns + +- Remove unused build dependencies: + - graphviz-gd is checked for, but unused: ggo#gegl/182. + - gtk-doc generation is disabled, i.e. unused. + - enscript just regenerates bundled files, add fix_doc_installation.patch + ------------------------------------------------------------------- Thu May 9 17:44:39 UTC 2019 - Bjørn Lie diff --git a/gegl.spec b/gegl.spec index cf37601..9908a69 100644 --- a/gegl.spec +++ b/gegl.spec @@ -25,14 +25,13 @@ Group: Productivity/Graphics/Other URL: http://gegl.org/ Source0: https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.bz2 Source99: baselibs.conf +# PATCH-FIX-OPENSUSE -- install bundled documentation even if enscript is not installed +Patch0: fix_doc_installation.patch BuildRequires: ImageMagick BuildRequires: SDL-devel >= 1.2.0 -BuildRequires: enscript BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel >= 1.32.0 -BuildRequires: graphviz-gd -BuildRequires: gtk-doc BuildRequires: libjpeg-devel BuildRequires: libspiro-devel BuildRequires: libstdc++-devel