[gstreamer: 151/222] Adjust provides generation for rpm >= 4.9.0
by Dominik Mierzejewski
commit 1ae5f2f50122ac735f66512b6a77d69f8846f6e8
Author: Bastien Nocera <hadess(a)hadess.net>
Date: Mon Mar 21 10:23:20 2011 +0000
Adjust provides generation for rpm >= 4.9.0
gstreamer.attr | 2 ++
gstreamer.spec | 17 ++++++++++-------
macros.gstreamer | 1 -
3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/gstreamer.attr b/gstreamer.attr
new file mode 100644
index 0000000..f4b1dfb
--- /dev/null
+++ b/gstreamer.attr
@@ -0,0 +1,2 @@
+%__gstreamer_provides %{_rpmconfigdir}/gstreamer.prov
+%__gstreamer_path ^%{_libdir}/gstreamer-.*/.*\.so$
diff --git a/gstreamer.spec b/gstreamer.spec
index c3abe6d..16c061e 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -7,7 +7,7 @@
Name: %{gstreamer}
Version: 0.10.32
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -38,7 +38,7 @@ BuildRequires: gcc-c++
# For the GStreamer RPM provides
Patch1: gstreamer-inspect-rpm-format.patch
Source1: gstreamer.prov
-Source2: macros.gstreamer
+Source2: gstreamer.attr
### documentation requirements
BuildRequires: python2
@@ -144,9 +144,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# Create empty cache directory
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor}
# Add the provides script
-install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/lib/rpm/gstreamer.prov
-# Add the macros file
-install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.gstreamer
+install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_rpmconfigdir}/gstreamer.prov
+# Add the gstreamer plugin file attribute entry (rpm >= 4.9.0)
+install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/gstreamer.attr
%clean
rm -rf $RPM_BUILD_ROOT
@@ -231,8 +231,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/gstreamer-dataprotocol-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-net-%{majorminor}.pc
-%{_prefix}/lib/rpm/gstreamer.prov
-%{_sysconfdir}/rpm/macros.gstreamer
+%{_rpmconfigdir}/gstreamer.prov
+%{_rpmconfigdir}/fileattrs/gstreamer.attr
%files devel-docs
%defattr(-, root, root, -)
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
+* Mon Mar 21 2011 Panu Matilainen <pmatilai(a)redhat.com> 0.10.32-4
+- Adjust provides generation for rpm >= 4.9.0
+
* Mon Mar 21 2011 Bastien Nocera <bnocera(a)redhat.com> 0.10.32-3
- Make it possible to auto-install GStreamer elements by name
4 years, 5 months
[gstreamer: 150/222] Make it possible to auto-install GStreamer elements by name
by Dominik Mierzejewski
commit 729b5afe9c3eb7e661e9e82e00949933a3027d4f
Author: Bastien Nocera <hadess(a)hadess.net>
Date: Mon Mar 21 02:59:34 2011 +0000
Make it possible to auto-install GStreamer elements by name
gstreamer-inspect-rpm-format.patch | 45 ++++++++++++++++++++------------------
gstreamer.spec | 5 ++++-
2 files changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/gstreamer-inspect-rpm-format.patch b/gstreamer-inspect-rpm-format.patch
index 7d3e5ef..caf6e28 100644
--- a/gstreamer-inspect-rpm-format.patch
+++ b/gstreamer-inspect-rpm-format.patch
@@ -1,17 +1,17 @@
-From 3f3f59c66d5eaf0efd32b8d6dabb7895cba5dda6 Mon Sep 17 00:00:00 2001
+From e4a4294f53d25bc3b5699cace74de4f49062a2ee Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess(a)hadess.net>
Date: Wed, 11 Nov 2009 13:53:46 +0000
Subject: [PATCH] Add RPM provides output to gst-inspect
---
- tools/gst-inspect.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++++---
- 1 files changed, 257 insertions(+), 15 deletions(-)
+ tools/gst-inspect.c | 275 ++++++++++++++++++++++++++++++++++++++++++++++++---
+ 1 files changed, 260 insertions(+), 15 deletions(-)
diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
-index b2502f4..dfd2eb4 100644
+index c86285e..80b2456 100644
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
-@@ -1308,9 +1308,225 @@ print_element_info (GstElementFactory * factory, gboolean print_names)
+@@ -1408,9 +1408,225 @@ print_element_info (GstElementFactory * factory, gboolean print_names)
return 0;
}
@@ -26,9 +26,8 @@ index b2502f4..dfd2eb4 100644
+ g_string_append (s->data, field);
+ }
+}
-
- static void
--print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
++
++static void
+print_gst_structure_append_field_index (GList * strings, const char *field,
+ guint num_items, guint offset)
+{
@@ -106,8 +105,9 @@ index b2502f4..dfd2eb4 100644
+ return 1;
+ return 0;
+}
-+
-+static void
+
+ static void
+-print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+print_gst_structure_for_rpm (const char *type_name, GstStructure * s)
+{
+ guint i, num_fields;
@@ -238,7 +238,7 @@ index b2502f4..dfd2eb4 100644
{
GstPadDirection direction;
const gchar *type_name;
-@@ -1335,6 +1551,12 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+@@ -1435,6 +1651,12 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
return;
}
@@ -251,7 +251,7 @@ index b2502f4..dfd2eb4 100644
/* decoder/demuxer sink pads should always be static and there should only
* be one, the same applies to encoders/muxers and source pads */
static_templates = gst_element_factory_get_static_pad_templates (factory);
-@@ -1371,15 +1593,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
+@@ -1471,15 +1693,20 @@ print_plugin_automatic_install_info_codecs (GstElementFactory * factory)
gst_structure_remove_field (s, "rate");
gst_structure_remove_field (s, "depth");
gst_structure_remove_field (s, "clock-rate");
@@ -276,7 +276,7 @@ index b2502f4..dfd2eb4 100644
{
gchar **protocols, **p;
-@@ -1388,11 +1615,17 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
+@@ -1488,11 +1715,17 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
switch (gst_element_factory_get_uri_type (factory)) {
case GST_URI_SINK:
for (p = protocols; *p != NULL; ++p)
@@ -296,7 +296,7 @@ index b2502f4..dfd2eb4 100644
break;
default:
break;
-@@ -1402,7 +1635,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
+@@ -1502,7 +1735,7 @@ print_plugin_automatic_install_info_protocols (GstElementFactory * factory)
}
static void
@@ -305,13 +305,16 @@ index b2502f4..dfd2eb4 100644
{
const gchar *plugin_name;
GList *features, *l;
-@@ -1422,11 +1655,12 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
+@@ -1522,11 +1755,15 @@ print_plugin_automatic_install_info (GstPlugin * plugin)
if (g_str_equal (plugin_name, feature->plugin_name)) {
GstElementFactory *factory;
- g_print ("element-%s\n", gst_plugin_feature_get_name (feature));
+ if (!rpm_format)
+ g_print ("element-%s\n", gst_plugin_feature_get_name (feature));
++ else
++ g_print ("gstreamer0.10(element-%s)\n",
++ gst_plugin_feature_get_name (feature));
factory = GST_ELEMENT_FACTORY (feature);
- print_plugin_automatic_install_info_protocols (factory);
@@ -321,7 +324,7 @@ index b2502f4..dfd2eb4 100644
}
}
-@@ -1446,7 +1680,7 @@ print_all_plugin_automatic_install_info (void)
+@@ -1546,7 +1783,7 @@ print_all_plugin_automatic_install_info (void)
plugin = (GstPlugin *) (plugins->data);
plugins = g_list_next (plugins);
@@ -330,7 +333,7 @@ index b2502f4..dfd2eb4 100644
}
gst_plugin_list_free (orig_plugins);
}
-@@ -1458,6 +1692,7 @@ main (int argc, char *argv[])
+@@ -1558,6 +1795,7 @@ main (int argc, char *argv[])
gboolean do_print_blacklist = FALSE;
gboolean plugin_name = FALSE;
gboolean print_aii = FALSE;
@@ -338,7 +341,7 @@ index b2502f4..dfd2eb4 100644
gboolean uri_handlers = FALSE;
#ifndef GST_DISABLE_OPTION_PARSING
GOptionEntry options[] = {
-@@ -1470,6 +1705,9 @@ main (int argc, char *argv[])
+@@ -1570,6 +1808,9 @@ main (int argc, char *argv[])
"or all plugins provide.\n "
"Useful in connection with external automatic plugin "
"installation mechanisms"), NULL},
@@ -348,7 +351,7 @@ index b2502f4..dfd2eb4 100644
{"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name,
N_("List the plugin contents"), NULL},
{"uri-handlers", 'u', 0, G_OPTION_ARG_NONE, &uri_handlers,
-@@ -1557,7 +1795,7 @@ main (int argc, char *argv[])
+@@ -1658,7 +1899,7 @@ main (int argc, char *argv[])
/* if there is such a plugin, print out info */
if (plugin) {
if (print_aii) {
@@ -357,7 +360,7 @@ index b2502f4..dfd2eb4 100644
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
-@@ -1570,13 +1808,17 @@ main (int argc, char *argv[])
+@@ -1671,13 +1912,17 @@ main (int argc, char *argv[])
if (plugin) {
if (print_aii) {
@@ -378,5 +381,5 @@ index b2502f4..dfd2eb4 100644
return -1;
}
--
-1.6.5.2
+1.7.4.1
diff --git a/gstreamer.spec b/gstreamer.spec
index 2dc7e1b..c3abe6d 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -7,7 +7,7 @@
Name: %{gstreamer}
Version: 0.10.32
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
+* Mon Mar 21 2011 Bastien Nocera <bnocera(a)redhat.com> 0.10.32-3
+- Make it possible to auto-install GStreamer elements by name
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.32-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
4 years, 5 months
[gstreamer: 149/222] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
by Dominik Mierzejewski
commit 11fe79fded28f528f08c3bfb05f69c5eb1e282b2
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 9 00:37:38 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
gstreamer.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index a6081a1..2dc7e1b 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -7,7 +7,7 @@
Name: %{gstreamer}
Version: 0.10.32
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.10.32-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Tue Jan 25 2011 Benjamin Otte <otte(a)redhat.com> 0.10.32-1
- Update to 0.10.32
4 years, 5 months
[gstreamer: 148/222] fix wrongly copy/pasted year
by Dominik Mierzejewski
commit 8ef62a5cfba88e449f99946f138ec9d08ef7c03b
Author: Benjamin Otte <otte(a)redhat.com>
Date: Tue Jan 25 00:45:24 2011 +0100
fix wrongly copy/pasted year
gstreamer.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index cb080b8..a6081a1 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -241,7 +241,7 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
-* Tue Jan 25 2010 Benjamin Otte <otte(a)redhat.com> 0.10.32-1
+* Tue Jan 25 2011 Benjamin Otte <otte(a)redhat.com> 0.10.32-1
- Update to 0.10.32
* Tue Jan 11 2011 Benjamin Otte <otte(a)redhat.com> 0.10.31.3-1
4 years, 5 months
[gstreamer: 147/222] Update to 0.10.32
by Dominik Mierzejewski
commit 9081d41da00586ce58514b05ecc178f34102cd8d
Author: Benjamin Otte <otte(a)redhat.com>
Date: Tue Jan 25 00:40:20 2011 +0100
Update to 0.10.32
.gitignore | 5 +----
gstreamer.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dd05e59..17e8f10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-gstreamer-0.10.30.tar.bz2
-/gstreamer-0.10.31.tar.bz2
-/gstreamer-0.10.31.2.tar.bz2
-/gstreamer-0.10.31.3.tar.bz2
+/gstreamer-0.10.32.tar.bz2
diff --git a/gstreamer.spec b/gstreamer.spec
index 9c2f475..cb080b8 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
%define _gobject-introspection 0.6.3
Name: %{gstreamer}
-Version: 0.10.31.3
+Version: 0.10.32
Release: 1%{?dist}
Summary: GStreamer streaming media framework runtime
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
+* Tue Jan 25 2010 Benjamin Otte <otte(a)redhat.com> 0.10.32-1
+- Update to 0.10.32
+
* Tue Jan 11 2011 Benjamin Otte <otte(a)redhat.com> 0.10.31.3-1
- Update to prerelease
diff --git a/sources b/sources
index 79cf616..4958a91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c04f0fbb2d092f377fdffbdd5ae64d9 gstreamer-0.10.31.3.tar.bz2
+442bc3d37b8511a73379143e7531d726 gstreamer-0.10.32.tar.bz2
4 years, 5 months
[gstreamer: 146/222] Update to prerelease
by Dominik Mierzejewski
commit 58ad0207fcaa796fdfdcab79ce24c46566754788
Author: Benjamin Otte <otte(a)redhat.com>
Date: Tue Jan 11 22:13:59 2011 +0100
Update to prerelease
.gitignore | 1 +
gstreamer.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7044ae0..dd05e59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
gstreamer-0.10.30.tar.bz2
/gstreamer-0.10.31.tar.bz2
/gstreamer-0.10.31.2.tar.bz2
+/gstreamer-0.10.31.3.tar.bz2
diff --git a/gstreamer.spec b/gstreamer.spec
index 009317c..9c2f475 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
%define _gobject-introspection 0.6.3
Name: %{gstreamer}
-Version: 0.10.31.2
+Version: 0.10.31.3
Release: 1%{?dist}
Summary: GStreamer streaming media framework runtime
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
+* Tue Jan 11 2011 Benjamin Otte <otte(a)redhat.com> 0.10.31.3-1
+- Update to prerelease
+
* Fri Jan 07 2011 Benjamin Otte <otte(a)redhat.com> 0.10.31.2-1
- Update to prerelease
diff --git a/sources b/sources
index 005897c..79cf616 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-161b75f9e47202a2d1d88b31c77a40dc gstreamer-0.10.31.2.tar.bz2
+5c04f0fbb2d092f377fdffbdd5ae64d9 gstreamer-0.10.31.3.tar.bz2
4 years, 5 months
[gstreamer: 145/222] Update to prerelease
by Dominik Mierzejewski
commit 5909b556d0cd685cd6f7a42d67642c19fe71d382
Author: Benjamin Otte <otte(a)redhat.com>
Date: Fri Jan 7 17:38:22 2011 +0100
Update to prerelease
.gitignore | 1 +
gstreamer.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c9c8ff..7044ae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
gstreamer-0.10.30.tar.bz2
/gstreamer-0.10.31.tar.bz2
+/gstreamer-0.10.31.2.tar.bz2
diff --git a/gstreamer.spec b/gstreamer.spec
index d3615d2..009317c 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
%define _gobject-introspection 0.6.3
Name: %{gstreamer}
-Version: 0.10.31
+Version: 0.10.31.2
Release: 1%{?dist}
Summary: GStreamer streaming media framework runtime
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
+* Fri Jan 07 2011 Benjamin Otte <otte(a)redhat.com> 0.10.31.2-1
+- Update to prerelease
+
* Wed Dec 01 2010 Benjamin Otte <otte(a)redhat.com> 0.10.31-1
- Update to 0.10.31
diff --git a/sources b/sources
index 2ac3fac..005897c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a21fb08bdb578d972c7c14e77da8fbb6 gstreamer-0.10.31.tar.bz2
+161b75f9e47202a2d1d88b31c77a40dc gstreamer-0.10.31.2.tar.bz2
4 years, 5 months
[gstreamer: 144/222] Update to 0.10.31
by Dominik Mierzejewski
commit fc88b6521db612c0e7025c9432091ab9fc388747
Author: Benjamin Otte <otte(a)redhat.com>
Date: Wed Dec 1 13:34:14 2010 +0100
Update to 0.10.31
.gitignore | 1 +
gstreamer-0.10.30-tabs.patch | 36 ------------------------------------
gstreamer.spec | 10 +++++-----
sources | 2 +-
4 files changed, 7 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 079f4f0..8c9c8ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gstreamer-0.10.30.tar.bz2
+/gstreamer-0.10.31.tar.bz2
diff --git a/gstreamer.spec b/gstreamer.spec
index 80863c6..d3615d2 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,8 +6,8 @@
%define _gobject-introspection 0.6.3
Name: %{gstreamer}
-Version: 0.10.30
-Release: 6%{?dist}
+Version: 0.10.31
+Release: 1%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -37,8 +37,6 @@ 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
@@ -120,7 +118,6 @@ with different major/minor versions of GStreamer.
%setup -q
%patch1 -p1 -b .rpm-provides
-%patch2 -p1 -b .tabs
%build
%configure \
@@ -244,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
+* Wed Dec 01 2010 Benjamin Otte <otte(a)redhat.com> 0.10.31-1
+- Update to 0.10.31
+
* Mon Nov 08 2010 Bastien Nocera <bnocera(a)redhat.com> 0.10.30-6
- Rebuild against newer gobject-introspection
diff --git a/sources b/sources
index 69c9a63..2ac3fac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de01f73f71d97c5854badd363ca06509 gstreamer-0.10.30.tar.bz2
+a21fb08bdb578d972c7c14e77da8fbb6 gstreamer-0.10.31.tar.bz2
4 years, 5 months
[gstreamer: 143/222] - Rebuild against newer gobject-introspection
by Dominik Mierzejewski
commit 301bd684980d81a98be2d9c13b3e8524ec20ebd9
Author: Bastien Nocera <hadess(a)hadess.net>
Date: Mon Nov 8 17:21:43 2010 +0000
- Rebuild against newer gobject-introspection
gstreamer.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index a7e0bd1..80863c6 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -7,7 +7,7 @@
Name: %{gstreamer}
Version: 0.10.30
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -244,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%changelog
+* Mon Nov 08 2010 Bastien Nocera <bnocera(a)redhat.com> 0.10.30-6
+- Rebuild against newer gobject-introspection
+
* Sun Nov 07 2010 Dan Horák <dan[at]danny.cz> 0.10.30-5
- Fix build with make 3.82
4 years, 5 months
[gstreamer: 142/222] - Fix build with make 3.82
by Dominik Mierzejewski
commit 56659b94d6784c57d6c9b575a63c9620bbed3157
Author: Dan Horák <dan(a)danny.cz>
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> 0.10.30-4
- Rebuild against newer gobject-introspection
4 years, 5 months