commit fca320cf7c926ce54197954a9e707b5dfa67fd49 Author: Bastien Nocera <hadess(a)fedoraproject.org&gt; Date: Tue Jan 20 16:13:11 2009 +0000 - Update to 0.10.22 - Remove upstreamed patches, update rpm provides patch .cvsignore | 2 +- gstreamer-0.10.21-fixgnomebz555631.patch | 164 ------------------------------- gstreamer-fix-bison-check.patch | 14 --- gstreamer-inspect-rpm-format.patch | 36 +++---- gstreamer.spec | 16 ++- sources | 2 +- 6 files changed, 26 insertions(+), 208 deletions(-) --- diff --git a/.cvsignore b/.cvsignore index 0fd136d..eba86bf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gstreamer-0.10.21.tar.bz2 +gstreamer-0.10.22.tar.bz2 diff --git a/gstreamer-inspect-rpm-format.patch b/gstreamer-inspect-rpm-format.patch index 44dea08..73c53e7 100644 --- a/gstreamer-inspect-rpm-format.patch +++ b/gstreamer-inspect-rpm-format.patch @@ -1,11 +1,11 @@ Index: gst-inspect.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/tools/gst-inspect.c,v -retrieving revision 1.142 -diff -u -p -r1.142 gst-inspect.c ---- gst-inspect.c 31 Jul 2008 15:20:31 -0000 1.142 -+++ gst-inspect.c 11 Sep 2008 23:47:16 -0000 -@@ -1188,9 +1188,219 @@ print_element_info (GstElementFactory * +retrieving revision 1.144 +diff -u -p -u -p -r1.144 gst-inspect.c +--- gst-inspect.c 17 Nov 2008 15:48:14 -0000 1.144 ++++ gst-inspect.c 20 Jan 2009 16:11:05 -0000 +@@ -1262,9 +1262,219 @@ print_element_info (GstElementFactory * return 0; } @@ -226,7 +226,7 @@ diff -u -p -r1.142 gst-inspect.c { GstPadDirection direction; const gchar *type_name; -@@ -1251,15 +1461,19 @@ print_plugin_automatic_install_info_code +@@ -1325,15 +1535,19 @@ print_plugin_automatic_install_info_code gst_structure_remove_field (s, "rate"); gst_structure_remove_field (s, "depth"); gst_structure_remove_field (s, "clock-rate"); @@ -250,7 +250,7 @@ diff -u -p -r1.142 gst-inspect.c { gchar **protocols, **p; -@@ -1268,11 +1482,17 @@ print_plugin_automatic_install_info_prot +@@ -1342,11 +1556,17 @@ print_plugin_automatic_install_info_prot switch (gst_element_factory_get_uri_type (factory)) { case GST_URI_SINK: for (p = protocols; *p != NULL; ++p) @@ -270,7 +270,7 @@ diff -u -p -r1.142 gst-inspect.c break; default: break; -@@ -1282,7 +1502,7 @@ print_plugin_automatic_install_info_prot +@@ -1356,7 +1576,7 @@ print_plugin_automatic_install_info_prot } static void @@ -279,7 +279,7 @@ diff -u -p -r1.142 gst-inspect.c { const gchar *plugin_name; GList *features, *l; -@@ -1302,11 +1522,12 @@ print_plugin_automatic_install_info (Gst +@@ -1376,11 +1596,12 @@ print_plugin_automatic_install_info (Gst if (g_str_equal (plugin_name, feature->plugin_name)) { GstElementFactory *factory; @@ -295,25 +295,25 @@ diff -u -p -r1.142 gst-inspect.c } } -@@ -1319,6 +1540,7 @@ main (int argc, char *argv[]) - { +@@ -1394,6 +1615,7 @@ main (int argc, char *argv[]) gboolean print_all = FALSE; + gboolean plugin_name = FALSE; gboolean print_aii = FALSE; + gboolean print_aii_rpm = FALSE; + gboolean uri_handlers = FALSE; GOptionEntry options[] = { {"print-all", 'a', 0, G_OPTION_ARG_NONE, &print_all, - N_("Print all elements"), NULL}, -@@ -1327,6 +1549,9 @@ main (int argc, char *argv[]) +@@ -1403,6 +1625,9 @@ main (int argc, char *argv[]) "provides.\n " "Useful in connection with external automatic plugin " "installation mechanisms"), NULL}, + {"rpm", '\0', 0, G_OPTION_ARG_NONE, &print_aii_rpm, + N_("Print the machine-parsable list of features of a plugin in RPM " + "Provides compatible-format"), NULL}, - GST_TOOLS_GOPTION_VERSION, - {NULL} - }; -@@ -1384,7 +1609,7 @@ main (int argc, char *argv[]) + {"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, +@@ -1478,7 +1703,7 @@ main (int argc, char *argv[]) /* if there is such a plugin, print out info */ if (plugin) { if (print_aii) { @@ -322,7 +322,7 @@ diff -u -p -r1.142 gst-inspect.c } else { print_plugin_info (plugin); print_plugin_features (plugin); -@@ -1397,13 +1622,16 @@ main (int argc, char *argv[]) +@@ -1491,13 +1716,16 @@ main (int argc, char *argv[]) if (plugin) { if (print_aii) { diff --git a/gstreamer.spec b/gstreamer.spec index 819c603..9be34c4 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -5,8 +5,8 @@ %define _libxml2 2.4.0 Name: %{gstreamer} -Version: 0.10.21 -Release: 4%{?dist} +Version: 0.10.22 +Release: 1%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia @@ -38,10 +38,6 @@ BuildRequires: gcc-c++ Patch1: gstreamer-inspect-rpm-format.patch Source1: gstreamer.prov Source2: macros.gstreamer -# From: http://bugzilla.gnome.org/show_bug.cgi?id=555631 -Patch2: gstreamer-0.10.21-fixgnomebz555631.patch -# From http://bugzilla.gnome.org/show_bug.cgi?id=564507 -Patch3: gstreamer-fix-bison-check.patch ### documentation requirements BuildRequires: python2 @@ -108,12 +104,8 @@ with different major/minor versions of GStreamer. pushd tools/ %patch1 -p0 -b .rpm-provides popd -%patch2 -p1 -b .gnomebz555631 -%patch3 -p0 -b .bison-check %build -autoreconf -libtoolize -f # 0.10.0: manuals do not build due to an openjade error; disable for now %configure \ --with-package-name='Fedora Core gstreamer package' \ @@ -223,6 +215,10 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.gstreamer %changelog +* Tue Jan 20 2009 - Bastien Nocera <bnocera(a)redhat.com&gt; - 0.10.22-1 +- Update to 0.10.22 +- Remove upstreamed patches, update rpm provides patch + * Mon Jan 05 2009 - Bastien Nocera <bnocera(a)redhat.com&gt; - 0.10.21-4 - Fix build with newer version of bison diff --git a/sources b/sources index ed1f31b..4422bc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bad90af3fd81a1535363cf85359125c gstreamer-0.10.21.tar.bz2 +35dd8598837af4074753afe5b59e8ef2 gstreamer-0.10.22.tar.bz2