commit 56659b94d6784c57d6c9b575a63c9620bbed3157 Author: Dan Horák <dan(a)danny.cz&gt; Date: Sun Nov 7 18:30:20 2010 +0100 - Fix build with make 3.82 gstreamer-0.10.30-tabs.patch | 36 ++++++++++++++++++++++++++++++++++++ gstreamer.spec | 8 +++++++- 2 files changed, 43 insertions(+), 1 deletion(-) --- diff --git a/gstreamer-0.10.30-tabs.patch b/gstreamer-0.10.30-tabs.patch new file mode 100644 index 0000000..db0ba15 --- /dev/null +++ b/gstreamer-0.10.30-tabs.patch @@ -0,0 +1,36 @@ +diff -up gstreamer-0.10.30/docs/gst/Makefile.in.tabs gstreamer-0.10.30/docs/gst/Makefile.in +--- gstreamer-0.10.30/docs/gst/Makefile.in.tabs 2010-07-15 11:20:00.000000000 +0200 ++++ gstreamer-0.10.30/docs/gst/Makefile.in 2010-11-07 18:23:10.000000000 +0100 +@@ -936,7 +936,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -up gstreamer-0.10.30/docs/libs/Makefile.in.tabs gstreamer-0.10.30/docs/libs/Makefile.in +--- gstreamer-0.10.30/docs/libs/Makefile.in.tabs 2010-11-07 18:24:56.000000000 +0100 ++++ gstreamer-0.10.30/docs/libs/Makefile.in 2010-11-07 18:25:02.000000000 +0100 +@@ -931,7 +931,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +diff -up gstreamer-0.10.30/docs/plugins/Makefile.in.tabs gstreamer-0.10.30/docs/plugins/Makefile.in +--- gstreamer-0.10.30/docs/plugins/Makefile.in.tabs 2010-11-07 18:26:29.000000000 +0100 ++++ gstreamer-0.10.30/docs/plugins/Makefile.in 2010-11-07 18:26:35.000000000 +0100 +@@ -1043,7 +1043,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + diff --git a/gstreamer.spec b/gstreamer.spec index 1b60f32..a7e0bd1 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -7,7 +7,7 @@ Name: %{gstreamer} Version: 0.10.30 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia @@ -37,6 +37,8 @@ BuildRequires: gcc-c++ # For the GStreamer RPM provides Patch1: gstreamer-inspect-rpm-format.patch +# Fix spaces/tabs in makefiles +Patch2: gstreamer-0.10.30-tabs.patch Source1: gstreamer.prov Source2: macros.gstreamer @@ -118,6 +120,7 @@ with different major/minor versions of GStreamer. %setup -q %patch1 -p1 -b .rpm-provides +%patch2 -p1 -b .tabs %build %configure \ @@ -241,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor} %changelog +* Sun Nov 07 2010 Dan Horák <dan[at]danny.cz> 0.10.30-5 +- Fix build with make 3.82 + * Wed Sep 22 2010 Matthias Clasen <mclasen(a)redhat.com&gt; 0.10.30-4 - Rebuild against newer gobject-introspection