commit 56d414531a8a7140ccc979aac34b8d298a2a16d2 Author: Wim Taymans <wtaymans(a)redhat.com&gt; Date: Mon Dec 19 15:06:01 2016 +0100 Fix docs fix-docs.patch | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gstreamer.spec | 7 ++++- 2 files changed, 90 insertions(+), 1 deletion(-) --- diff --git a/fix-docs.patch b/fix-docs.patch new file mode 100644 index 0000000..7fae503 --- /dev/null +++ b/fix-docs.patch @@ -0,0 +1,84 @@ +diff -ru gstreamer-0.10.36/docs/gst/Makefile.in gstreamer-0.10.36.new/docs/gst/Makefile.in +--- gstreamer-0.10.36/docs/gst/Makefile.in 2012-02-20 23:48:21.000000000 +0100 ++++ gstreamer-0.10.36.new/docs/gst/Makefile.in 2016-12-19 14:59:35.661677389 +0100 +@@ -839,10 +839,7 @@ + @ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \ + @ENABLE_GTK_DOC_TRUE@ mkhtml_options=--path="$(abs_srcdir)"; \ + @ENABLE_GTK_DOC_TRUE@ fi; \ +-@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(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 $(MKHTML_OPTIONS) $(DOC_MODULE)-@GST_MAJORMINOR@ ../$(DOC_MAIN_SGML_FILE) + @ENABLE_GTK_DOC_TRUE@ @rm -rf html/xml + @ENABLE_GTK_DOC_TRUE@ @rm -f version.entities + @ENABLE_GTK_DOC_TRUE@ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html ) +@@ -896,9 +893,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 gstreamer-0.10.36/docs/libs/Makefile.in gstreamer-0.10.36.new/docs/libs/Makefile.in +--- gstreamer-0.10.36/docs/libs/Makefile.in 2012-02-20 23:48:21.000000000 +0100 ++++ gstreamer-0.10.36.new/docs/libs/Makefile.in 2016-12-19 15:00:14.837745929 +0100 +@@ -828,10 +828,7 @@ + @ENABLE_GTK_DOC_TRUE@ if test "$(?)" = "0"; then \ + @ENABLE_GTK_DOC_TRUE@ mkhtml_options=--path="$(abs_srcdir)"; \ + @ENABLE_GTK_DOC_TRUE@ fi; \ +-@ENABLE_GTK_DOC_TRUE@ cd html && gtkdoc-mkhtml $$mkhtml_options $(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 $(MKHTML_OPTIONS) $(DOC_MODULE)-@GST_MAJORMINOR@ ../$(DOC_MAIN_SGML_FILE) + @ENABLE_GTK_DOC_TRUE@ @rm -rf html/xml + @ENABLE_GTK_DOC_TRUE@ @rm -f version.entities + @ENABLE_GTK_DOC_TRUE@ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) $(abs_builddir)/html ) +@@ -885,9 +882,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 gstreamer-0.10.36/docs/plugins/Makefile.in gstreamer-0.10.36.new/docs/plugins/Makefile.in +--- gstreamer-0.10.36/docs/plugins/Makefile.in 2012-02-20 23:48:22.000000000 +0100 ++++ gstreamer-0.10.36.new/docs/plugins/Makefile.in 2016-12-19 15:01:07.876484878 +0100 +@@ -944,10 +944,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 +@@ -1007,9 +1004,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 --git a/gstreamer.spec b/gstreamer.spec index a3ed7da..383f03b 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -7,7 +7,7 @@ Name: %{gstreamer} Version: 0.10.36 -Release: 14%{?dist} +Release: 15%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia @@ -40,6 +40,7 @@ BuildRequires: gcc-c++ # For the GStreamer RPM provides Patch1: gstreamer-inspect-rpm-format.patch +Patch2: fix-docs.patch Source1: gstreamer.prov Source2: gstreamer.attr @@ -122,6 +123,7 @@ with different major/minor versions of GStreamer. %setup -q %patch0 -p1 -b .bison3 %patch1 -p1 -b .rpm-provides +%patch2 -p1 -b .fix-docs %build %configure \ @@ -250,6 +252,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor} %changelog +* Mon Dec 19 2016 Wim Taymans <wtaymans(a)redhat.com&gt; - 0.10.36-15 +- Fix docs + * Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org&gt; - 0.10.36-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild