Hello community,
here is the log from the commit of package gstreamer-0_10-plugins-good for
openSUSE:Factory checked in at 2016-03-29 14:49:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-0_10-plugins-good (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-0_10-plugins-good.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-0_10-plugins-good"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-0_10-plugins-good/gstreamer-0_10-plugins-good.changes
2015-01-21 21:54:38.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.gstreamer-0_10-plugins-good.new/gstreamer-0_10-plugins-good.changes
2016-03-29 14:49:36.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Mar 24 20:08:56 UTC 2016 - [email protected]
+
+- Add gstreamer-0_10-plugins-good-gtk-doc-1.25.patch: Fix build
+ with gtk-doc 1.25. index.sgml is an internal file and must not be
+ messed with (and with gtk-doc 1.25 it is no longer created).
+
+-------------------------------------------------------------------
New:
----
gstreamer-0_10-plugins-good-gtk-doc-1.25.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-0_10-plugins-good.spec ++++++
--- /var/tmp/diff_new_pack.kQZHkM/_old 2016-03-29 14:49:37.000000000 +0200
+++ /var/tmp/diff_new_pack.kQZHkM/_new 2016-03-29 14:49:37.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gstreamer-0_10-plugins-good
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,6 +42,8 @@
Patch3: gst-0_10-docs-fix-mismatched-para-tags.patch
# PATCH-FIX-UPSTREAM gst-0_10-docs-use-docbook-markup-for-xi:include.patch
[email protected] -- docs: use docbook markup for xi:include It turns out
that the change in gtk-doc-1.20 which wraps the |[]| content in CDATA break
xi:inlcude examples.
Patch4: gst-0_10-docs-use-docbook-markup-for-xi:include.patch
+# PATCH-FIX-UPSTREAM gstreamer-0_10-plugins-good-gtk-doc-1.25.patch
[email protected] -- Fix build with gtk-doc 1.25. index.sgml is an internal
file and must not be messed with (and with gtk-doc 1.25 it is no longer
created).
+Patch5: gstreamer-0_10-plugins-good-gtk-doc-1.25.patch
%if 0%{?ENABLE_AALIB}
BuildRequires: aalib-devel
%endif
@@ -197,6 +199,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
# FIXME:
++++++ gstreamer-0_10-plugins-good-gtk-doc-1.25.patch ++++++
Index: gst-plugins-good-0.10.31/common/gtk-doc-plugins.mak
===================================================================
--- gst-plugins-good-0.10.31.orig/common/gtk-doc-plugins.mak
+++ gst-plugins-good-0.10.31/common/gtk-doc-plugins.mak
@@ -224,9 +224,6 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
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
@rm -f html/$(DOC_MAIN_SGML_FILE)
@rm -rf html/xml
@rm -f html/version.entities
Index: gst-plugins-good-0.10.31/common/gtk-doc.mak
===================================================================
--- gst-plugins-good-0.10.31.orig/common/gtk-doc.mak
+++ gst-plugins-good-0.10.31/common/gtk-doc.mak
@@ -131,9 +131,6 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
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
@rm -rf html/xml
@rm -f version.entities
@test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES)
$(abs_builddir)/html )
Index: gst-plugins-good-0.10.31/docs/plugins/Makefile.in
===================================================================
--- gst-plugins-good-0.10.31.orig/docs/plugins/Makefile.in
+++ gst-plugins-good-0.10.31/docs/plugins/Makefile.in
@@ -1154,9 +1154,6 @@ update:
@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@ @rm -f html/$(DOC_MAIN_SGML_FILE)
@ENABLE_GTK_DOC_TRUE@ @rm -rf html/xml
@ENABLE_GTK_DOC_TRUE@ @rm -f html/version.entities