diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec index 84a9b25..9690b13 100644 --- a/gstreamer-plugins-good.spec +++ b/gstreamer-plugins-good.spec @@ -31,6 +31,7 @@ Patch4: 0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch Patch5: 0001-sys-v4l2-Some-blind-compilation-fixes.patch # https://bugzilla.gnome.org/show_bug.cgi?id=724085 Patch6: gnome-724085.patch +Patch7: put-api-version-in-html-book-name.patch Requires: %{gstreamer} >= %{_gst} Requires(pre): GConf2 @@ -149,6 +150,7 @@ which are not used very much and require additional libraries to be installed. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build @@ -301,6 +303,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{maj %changelog * Tue Dec 06 2016 Wim Taymans - 0.10.31-17 - Disable insecure FLX plugin (rhbz#1397441) +- fix doc build * Wed Feb 03 2016 Fedora Release Engineering - 0.10.31-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/put-api-version-in-html-book-name.patch b/put-api-version-in-html-book-name.patch new file mode 100644 index 0000000..de81729 --- /dev/null +++ b/put-api-version-in-html-book-name.patch @@ -0,0 +1,84 @@ +diff -ru gst-plugins-good-0.10.31/common/gtk-doc.mak gst-plugins-good-0.10.31.docbook/common/gtk-doc.mak +--- gst-plugins-good-0.10.31/common/gtk-doc.mak 2011-12-30 14:59:21.000000000 +0100 ++++ gst-plugins-good-0.10.31.docbook/common/gtk-doc.mak 2016-12-06 14:06:06.953785693 +0100 +@@ -130,10 +130,7 @@ + if test "$(?)" = "0"; then \ + mkhtml_options=--path="$(abs_srcdir)"; \ + fi; \ +- cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) +- @mv html/index.sgml html/index.sgml.bak +- @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml +- @rm -f html/index.sgml.bak ++ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE)-@GST_MAJORMINOR@ ../$(DOC_MAIN_SGML_FILE) + @rm -rf html/xml + @rm -f version.entities + @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html ) +@@ -189,9 +186,9 @@ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \ +- if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \ +- $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \ ++ echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \ ++ if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \ ++ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \ + $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \ + fi; \ + (which gtkdoc-rebase >/dev/null && \ +diff -ru gst-plugins-good-0.10.31/common/gtk-doc-plugins.mak gst-plugins-good-0.10.31.docbook/common/gtk-doc-plugins.mak +--- gst-plugins-good-0.10.31/common/gtk-doc-plugins.mak 2011-12-30 14:59:21.000000000 +0100 ++++ gst-plugins-good-0.10.31.docbook/common/gtk-doc-plugins.mak 2016-12-06 14:06:55.123696984 +0100 +@@ -223,10 +223,7 @@ + mkhtml_options="$$mkhtml_options --verbose"; \ + fi; \ + fi; \ +- cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) +- @mv html/index.sgml html/index.sgml.bak +- @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml +- @rm -f html/index.sgml.bak ++ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE) + @rm -f html/$(DOC_MAIN_SGML_FILE) + @rm -rf html/xml + @rm -f html/version.entities +@@ -290,9 +287,9 @@ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + fi; \ +- echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \ +- if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \ +- $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \ ++ echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \ ++ if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \ ++ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \ + $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \ + fi; \ + (which gtkdoc-rebase >/dev/null && \ +diff -ru gst-plugins-good-0.10.31/docs/plugins/Makefile.in gst-plugins-good-0.10.31.docbook/docs/plugins/Makefile.in +--- gst-plugins-good-0.10.31/docs/plugins/Makefile.in 2012-02-21 01:08:52.000000000 +0100 ++++ gst-plugins-good-0.10.31.docbook/docs/plugins/Makefile.in 2016-12-06 14:08:18.480812994 +0100 +@@ -1153,10 +1153,7 @@ + @ENABLE_GTK_DOC_TRUE@ mkhtml_options="$$mkhtml_options --verbose"; \ + @ENABLE_GTK_DOC_TRUE@ fi; \ + @ENABLE_GTK_DOC_TRUE@ fi; \ +-@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) +-@ENABLE_GTK_DOC_TRUE@ @mv html/index.sgml html/index.sgml.bak +-@ENABLE_GTK_DOC_TRUE@ @$(SED) "s/ href=\"$(DOC_MODULE)\// href=\"$(DOC_MODULE)-@GST_MAJORMINOR@\//g" html/index.sgml.bak >html/index.sgml +-@ENABLE_GTK_DOC_TRUE@ @rm -f html/index.sgml.bak ++@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(DOC_MODULE)-@GST_MAJORMINOR@ $(DOC_MAIN_SGML_FILE) + @ENABLE_GTK_DOC_TRUE@ @rm -f html/$(DOC_MAIN_SGML_FILE) + @ENABLE_GTK_DOC_TRUE@ @rm -rf html/xml + @ENABLE_GTK_DOC_TRUE@ @rm -f html/version.entities +@@ -1216,9 +1213,9 @@ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + fi; \ +- echo '-- Installing $(builddir)/html/$(DOC_MODULE).devhelp2' ; \ +- if test -e $(builddir)/html/$(DOC_MODULE).devhelp2; then \ +- $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE).devhelp2 \ ++ echo '-- Installing $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2' ; \ ++ if test -e $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; then \ ++ $(INSTALL_DATA) $(builddir)/html/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2 \ + $(DESTDIR)$(TARGET_DIR)/$(DOC_MODULE)-@GST_MAJORMINOR@.devhelp2; \ + fi; \ + (which gtkdoc-rebase >/dev/null && \