[gstreamer: 91/222] fix gnome bz 555631
by Dominik Mierzejewski
commit 74ad712f0d7ff08268c7b670efe2c42d9f5246f0
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Nov 12 15:01:45 2008 +0000
fix gnome bz 555631
gstreamer-0.10.21-fixgnomebz555631.patch | 164 +++++++++++++++++++++++++++++++
gstreamer.spec | 13 ++-
2 files changed, 175 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer-0.10.21-fixgnomebz555631.patch b/gstreamer-0.10.21-fixgnomebz555631.patch
new file mode 100644
index 0000000..d8e4281
--- /dev/null
+++ b/gstreamer-0.10.21-fixgnomebz555631.patch
@@ -0,0 +1,164 @@
+diff -up gstreamer-0.10.21/libs/gst/base/gstbasetransform.c.BAD gstreamer-0.10.21/libs/gst/base/gstbasetransform.c
+--- gstreamer-0.10.21/libs/gst/base/gstbasetransform.c.BAD 2008-11-11 16:45:10.000000000 -0500
++++ gstreamer-0.10.21/libs/gst/base/gstbasetransform.c 2008-11-11 16:45:16.000000000 -0500
+@@ -251,7 +251,7 @@ struct _GstBaseTransformPrivate
+ /* upstream caps and size suggestions */
+ GstCaps *sink_suggest;
+ guint size_suggest;
+- gint suggest_pending;
++ gboolean suggest_pending;
+
+ gboolean reconfigure;
+ };
+@@ -896,6 +896,18 @@ gst_base_transform_find_transform (GstBa
+ gst_pad_fixate_caps (otherpad, othercaps);
+ }
+ GST_DEBUG_OBJECT (trans, "after fixating %" GST_PTR_FORMAT, othercaps);
++ } else {
++ /* else caps are fixed but the subclass may want to add fields */
++ if (klass->fixate_caps) {
++ othercaps = gst_caps_make_writable (othercaps);
++
++ GST_DEBUG_OBJECT (trans, "doing fixate %" GST_PTR_FORMAT
++ " using caps %" GST_PTR_FORMAT
++ " on pad %s:%s using fixate_caps vmethod", othercaps, caps,
++ GST_DEBUG_PAD_NAME (otherpad));
++
++ klass->fixate_caps (trans, GST_PAD_DIRECTION (pad), caps, othercaps);
++ }
+ }
+
+ /* caps should be fixed now, if not we have to fail. */
+@@ -1074,6 +1086,8 @@ gst_base_transform_prepare_output_buffer
+
+ priv = trans->priv;
+
++ *out_buf = NULL;
++
+ /* figure out how to allocate a buffer based on the current configuration */
+ if (trans->passthrough) {
+ GST_DEBUG_OBJECT (trans, "doing passthrough alloc");
+@@ -1224,7 +1238,7 @@ gst_base_transform_prepare_output_buffer
+ gst_caps_unref (priv->sink_suggest);
+ priv->sink_suggest = gst_caps_ref (othercaps);
+ priv->size_suggest = size_suggest;
+- g_atomic_int_set (&trans->priv->suggest_pending, 1);
++ trans->priv->suggest_pending = TRUE;
+ GST_OBJECT_UNLOCK (trans->sinkpad);
+ }
+ gst_caps_unref (othercaps);
+@@ -1366,7 +1380,7 @@ gst_base_transform_buffer_alloc (GstPad
+ GstBaseTransform *trans;
+ GstBaseTransformPrivate *priv;
+ GstFlowReturn res;
+- gboolean proxy, suggest;
++ gboolean proxy, suggest, same_caps;
+ GstCaps *sink_suggest;
+ guint size_suggest;
+
+@@ -1384,8 +1398,12 @@ gst_base_transform_buffer_alloc (GstPad
+
+ /* we remember our previous alloc request to quickly see if we can proxy or
+ * not. We skip this check if we have a pending suggestion. */
+- if (g_atomic_int_get (&priv->suggest_pending) == 0 && caps &&
+- gst_caps_is_equal (priv->sink_alloc, caps)) {
++ GST_OBJECT_LOCK (pad);
++ same_caps = !priv->suggest_pending && caps &&
++ gst_caps_is_equal (priv->sink_alloc, caps);
++ GST_OBJECT_UNLOCK (pad);
++
++ if (same_caps) {
+ /* we have seen this before, see below if we need to proxy */
+ GST_DEBUG_OBJECT (trans, "have old caps");
+ sink_suggest = caps;
+@@ -1414,7 +1432,7 @@ gst_base_transform_buffer_alloc (GstPad
+ size_suggest = size;
+ suggest = FALSE;
+ }
+- g_atomic_int_set (&priv->suggest_pending, 0);
++ priv->suggest_pending = FALSE;
+ GST_OBJECT_UNLOCK (pad);
+
+ /* check if we actually handle this format on the sinkpad */
+@@ -1462,7 +1480,10 @@ gst_base_transform_buffer_alloc (GstPad
+ }
+ }
+ /* remember the new caps */
++ GST_OBJECT_LOCK (pad);
+ gst_caps_replace (&priv->sink_alloc, sink_suggest);
++ GST_OBJECT_UNLOCK (pad);
++
+ proxy = priv->proxy_alloc;
+ GST_DEBUG_OBJECT (trans, "doing default alloc, proxy %d", proxy);
+
+@@ -1487,11 +1508,13 @@ gst_base_transform_buffer_alloc (GstPad
+ if (!gst_caps_is_equal (newcaps, caps)) {
+ GST_DEBUG_OBJECT (trans, "caps are new");
+ /* we have new caps, see if we can proxy downstream */
+- if (gst_pad_peer_accept_caps (trans->sinkpad, newcaps)) {
++ if (gst_pad_peer_accept_caps (pad, newcaps)) {
+ /* peer accepts the caps, return a buffer in this format */
+ GST_DEBUG_OBJECT (trans, "peer accepted new caps");
+ /* remember the format */
++ GST_OBJECT_LOCK (pad);
+ gst_caps_replace (&priv->sink_alloc, newcaps);
++ GST_OBJECT_UNLOCK (pad);
+ } else {
+ GST_DEBUG_OBJECT (trans, "peer did not accept new caps");
+ /* peer does not accept the caps, free the buffer we received and
+@@ -1694,6 +1717,7 @@ gst_base_transform_handle_buffer (GstBas
+ GST_OBJECT_UNLOCK (trans);
+
+ if (G_UNLIKELY (reconfigure)) {
++ GST_DEBUG_OBJECT (trans, "we had a pending reconfigure");
+ /* if we need to reconfigure we pretend a buffer with new caps arrived. This
+ * will reconfigure the transform with the new output format. We can only
+ * do this if the buffer actually has caps. */
+@@ -1853,15 +1877,25 @@ gst_base_transform_getrange (GstPad * pa
+ trans = GST_BASE_TRANSFORM (gst_pad_get_parent (pad));
+
+ ret = gst_pad_pull_range (trans->sinkpad, offset, length, &inbuf);
+- if (ret == GST_FLOW_OK) {
+- GST_BASE_TRANSFORM_LOCK (trans);
+- ret = gst_base_transform_handle_buffer (trans, inbuf, buffer);
+- GST_BASE_TRANSFORM_UNLOCK (trans);
+- }
++ if (G_UNLIKELY (ret != GST_FLOW_OK))
++ goto pull_error;
++
++ GST_BASE_TRANSFORM_LOCK (trans);
++ ret = gst_base_transform_handle_buffer (trans, inbuf, buffer);
++ GST_BASE_TRANSFORM_UNLOCK (trans);
+
++done:
+ gst_object_unref (trans);
+
+ return ret;
++
++ /* ERRORS */
++pull_error:
++ {
++ GST_DEBUG_OBJECT (trans, "failed to pull a buffer: %s",
++ gst_flow_get_name (ret));
++ goto done;
++ }
+ }
+
+ static GstFlowReturn
+@@ -2305,7 +2339,7 @@ gst_base_transform_suggest (GstBaseTrans
+ caps = gst_caps_copy (caps);
+ trans->priv->sink_suggest = caps;
+ trans->priv->size_suggest = size;
+- g_atomic_int_set (&trans->priv->suggest_pending, 1);
++ trans->priv->suggest_pending = TRUE;
+ GST_DEBUG_OBJECT (trans, "new suggest %" GST_PTR_FORMAT, caps);
+ GST_OBJECT_UNLOCK (trans->sinkpad);
+ }
+@@ -2326,6 +2360,7 @@ gst_base_transform_reconfigure (GstBaseT
+ g_return_if_fail (GST_IS_BASE_TRANSFORM (trans));
+
+ GST_OBJECT_LOCK (trans);
++ GST_DEBUG_OBJECT (trans, "marking reconfigure");
+ trans->priv->reconfigure = TRUE;
+ GST_OBJECT_UNLOCK (trans);
+ }
diff --git a/gstreamer.spec b/gstreamer.spec
index b3d8988..c28a9f2 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
Name: %{gstreamer}
Version: 0.10.21
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -27,6 +27,8 @@ BuildRequires: m4
BuildRequires: check-devel
BuildRequires: gtk-doc >= 1.3
BuildRequires: gettext
+# We need to use the system libtool or else we end up with RPATHs
+BuildRequires: libtool
# because AM_PROG_LIBTOOL was used in configure.ac
BuildRequires: gcc-c++
@@ -35,6 +37,8 @@ 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
### documentation requirements
BuildRequires: python2
@@ -101,6 +105,7 @@ with different major/minor versions of GStreamer.
pushd tools/
%patch1 -p0 -b .rpm-provides
popd
+%patch2 -p1 -b .gnomebz555631
%build
# 0.10.0: manuals do not build due to an openjade error; disable for now
@@ -113,7 +118,7 @@ popd
#make %{?_smp_mflags}
# FIXME: docs building doesn't work with smp yet
-make ERROR_CFLAGS=""
+make ERROR_CFLAGS="" LIBTOOL="%{_bindir}/libtool"
%install
rm -rf $RPM_BUILD_ROOT
@@ -212,6 +217,10 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.gstreamer
%changelog
+* Tue Nov 11 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.10.21-2
+- fix gnome bz 555631 with patch from upstream cvs
+- use system libtool to prevent rpaths
+
* Fri Oct 03 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.21-1
- Update to 0.10.21
4 years, 5 months
[gstreamer: 90/222] - Update to 0.10.21
by Dominik Mierzejewski
commit 6d85a84a18a684527ae7adc7e131f6aef76cc99a
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Fri Oct 3 08:12:48 2008 +0000
- Update to 0.10.21
.cvsignore | 2 +-
gstreamer.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index b4e748a..0fd136d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gstreamer-0.10.20.tar.bz2
+gstreamer-0.10.21.tar.bz2
diff --git a/gstreamer.spec b/gstreamer.spec
index 066c010..b3d8988 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -5,8 +5,8 @@
%define _libxml2 2.4.0
Name: %{gstreamer}
-Version: 0.10.20
-Release: 6%{?dist}
+Version: 0.10.21
+Release: 1%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -212,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.gstreamer
%changelog
+* Fri Oct 03 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.21-1
+- Update to 0.10.21
+
* Sun Sep 14 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-6
- Hopefully fix RPM provides problem when the GStreamer plugin
requires a library installed by the package itself
diff --git a/sources b/sources
index f24e7ff..ed1f31b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5af70413a65ebf855f788f965685e2b gstreamer-0.10.20.tar.bz2
+7bad90af3fd81a1535363cf85359125c gstreamer-0.10.21.tar.bz2
4 years, 5 months
[gstreamer: 89/222] - Hopefully fix RPM provides problem when the GStreamer plugin requires a library installed by t
by Dominik Mierzejewski
commit 47967d643006d4c49c328fefa5f24fb659134d9c
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Sun Sep 14 13:20:53 2008 +0000
- Hopefully fix RPM provides problem when the GStreamer plugin requires a
library installed by the package itself
gstreamer.prov | 9 ++++++++-
gstreamer.spec | 6 +++++-
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer.prov b/gstreamer.prov
index a55aa76..4e3ca76 100755
--- a/gstreamer.prov
+++ b/gstreamer.prov
@@ -26,9 +26,16 @@ function getmark()
grep "ELF 64-bit" >/dev/null; then echo -n "$mark64"; fi`
}
+function libdir()
+{
+ buildlibdir=`dirname $1`
+ buildlibdir=`dirname $buildlibdir`
+}
+
for so in $solist ; do
getmark $so
- gst-inspect --print-plugin-auto-install-info --rpm $so 2> /dev/null | while read line ; do
+ libdir $so
+ LD_LIBRARY_PATH=$buildlibdir gst-inspect --print-plugin-auto-install-info --rpm $so 2> /dev/null | while read line ; do
echo -n "$line";
echo -n "$lib64"
echo
diff --git a/gstreamer.spec b/gstreamer.spec
index 5c79a56..066c010 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
Name: %{gstreamer}
Version: 0.10.20
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -212,6 +212,10 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.gstreamer
%changelog
+* Sun Sep 14 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-6
+- Hopefully fix RPM provides problem when the GStreamer plugin
+ requires a library installed by the package itself
+
* Fri Sep 12 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-5
- Update rpm provides script and patch to:
- filter out errors
4 years, 5 months
[gstreamer: 88/222] - Update rpm provides script and patch to: - filter out errors - only run gst-inspect on gstreamer p
by Dominik Mierzejewski
commit 4a93871270aa9a67c10fd853793ce1a6b426a983
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Sep 11 23:48:12 2008 +0000
- Update rpm provides script and patch to:
- filter out errors
- only run gst-inspect on gstreamer plugins
- print out protocol handlers provides correctly
gstreamer-inspect-rpm-format.patch | 54 +++++++++++++++++++++++++++++---------
gstreamer.prov | 6 ++---
gstreamer.spec | 8 +++++-
3 files changed, 52 insertions(+), 16 deletions(-)
---
diff --git a/gstreamer-inspect-rpm-format.patch b/gstreamer-inspect-rpm-format.patch
index 0661364..44dea08 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.137
-diff -u -p -u -p -r1.137 gst-inspect.c
---- gst-inspect.c 29 Feb 2008 12:41:32 -0000 1.137
-+++ gst-inspect.c 17 Mar 2008 18:56:00 -0000
-@@ -1168,9 +1168,219 @@ print_element_info (GstElementFactory *
+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 *
return 0;
}
@@ -226,7 +226,7 @@ diff -u -p -u -p -r1.137 gst-inspect.c
{
GstPadDirection direction;
const gchar *type_name;
-@@ -1231,15 +1441,19 @@ print_plugin_automatic_install_info_code
+@@ -1251,15 +1461,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,27 @@ diff -u -p -u -p -r1.137 gst-inspect.c
{
gchar **protocols, **p;
-@@ -1262,7 +1476,7 @@ print_plugin_automatic_install_info_prot
+@@ -1268,11 +1482,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)
+- g_print ("urisink-%s\n", *p);
++ if (!rpm_format)
++ g_print ("urisink-%s\n", *p);
++ else
++ g_print ("gstreamer0.10(urisink-%s)\n", *p);
+ break;
+ case GST_URI_SRC:
+ for (p = protocols; *p != NULL; ++p)
+- g_print ("urisource-%s\n", *p);
++ if (!rpm_format)
++ g_print ("urisource-%s\n", *p);
++ else
++ g_print ("gstreamer0.10(urisource-%s)\n", *p);
+ break;
+ default:
+ break;
+@@ -1282,7 +1502,7 @@ print_plugin_automatic_install_info_prot
}
static void
@@ -259,7 +279,7 @@ diff -u -p -u -p -r1.137 gst-inspect.c
{
const gchar *plugin_name;
GList *features, *l;
-@@ -1282,11 +1496,12 @@ print_plugin_automatic_install_info (Gst
+@@ -1302,11 +1522,12 @@ print_plugin_automatic_install_info (Gst
if (g_str_equal (plugin_name, feature->plugin_name)) {
GstElementFactory *factory;
@@ -275,7 +295,7 @@ diff -u -p -u -p -r1.137 gst-inspect.c
}
}
-@@ -1299,6 +1514,7 @@ main (int argc, char *argv[])
+@@ -1319,6 +1540,7 @@ main (int argc, char *argv[])
{
gboolean print_all = FALSE;
gboolean print_aii = FALSE;
@@ -283,7 +303,7 @@ diff -u -p -u -p -r1.137 gst-inspect.c
GOptionEntry options[] = {
{"print-all", 'a', 0, G_OPTION_ARG_NONE, &print_all,
N_("Print all elements"), NULL},
-@@ -1307,6 +1523,9 @@ main (int argc, char *argv[])
+@@ -1327,6 +1549,9 @@ main (int argc, char *argv[])
"provides.\n "
"Useful in connection with external automatic plugin "
"installation mechanisms"), NULL},
@@ -293,7 +313,7 @@ diff -u -p -u -p -r1.137 gst-inspect.c
GST_TOOLS_GOPTION_VERSION,
{NULL}
};
-@@ -1364,7 +1583,7 @@ main (int argc, char *argv[])
+@@ -1384,7 +1609,7 @@ main (int argc, char *argv[])
/* if there is such a plugin, print out info */
if (plugin) {
if (print_aii) {
@@ -302,7 +322,7 @@ diff -u -p -u -p -r1.137 gst-inspect.c
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
-@@ -1377,7 +1596,7 @@ main (int argc, char *argv[])
+@@ -1397,13 +1622,16 @@ main (int argc, char *argv[])
if (plugin) {
if (print_aii) {
@@ -311,3 +331,13 @@ diff -u -p -u -p -r1.137 gst-inspect.c
} else {
print_plugin_info (plugin);
print_plugin_features (plugin);
+ }
+ } else {
+- g_print (_("Could not load plugin file: %s\n"), error->message);
++ if (!print_aii_rpm)
++ g_print (_("Could not load plugin file: %s\n"), error->message);
++ else
++ g_printerr (_("Could not load plugin file: %s\n"), error->message);
+ g_error_free (error);
+ return -1;
+ }
diff --git a/gstreamer.prov b/gstreamer.prov
index 0b19c7e..a55aa76 100755
--- a/gstreamer.prov
+++ b/gstreamer.prov
@@ -9,7 +9,7 @@
# Based on other provides scripts from RPM
#
-filelist=`sed "s/['\"]/\\\&/g"`
+filelist=`grep -e '.so$' | sed "s/['\"]/\\\&/g"`
# --- Alpha does not mark 64bit dependencies•
case `uname -m` in
@@ -17,7 +17,7 @@ case `uname -m` in
*) mark64="()(64bit)" ;;
esac
-solist=$(echo $filelist | grep "\\.so" | grep -v "^/lib/ld.so" | \
+solist=$(echo $filelist | grep -v "^/lib/ld.so" | \
xargs file -L 2>/dev/null | grep "ELF.*shared object" | cut -d: -f1 | grep libgst)
function getmark()
@@ -28,7 +28,7 @@ function getmark()
for so in $solist ; do
getmark $so
- gst-inspect --print-plugin-auto-install-info --rpm $so | while read line ; do
+ gst-inspect --print-plugin-auto-install-info --rpm $so 2> /dev/null | while read line ; do
echo -n "$line";
echo -n "$lib64"
echo
diff --git a/gstreamer.spec b/gstreamer.spec
index c73ac69..5c79a56 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
Name: %{gstreamer}
Version: 0.10.20
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -212,6 +212,12 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.gstreamer
%changelog
+* Fri Sep 12 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-5
+- Update rpm provides script and patch to:
+ - filter out errors
+ - only run gst-inspect on gstreamer plugins
+ - print out protocol handlers provides correctly
+
* Thu Sep 11 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-4
- Add the rpm scripts install in /usr/lib/rpm, not under libdir on 64-bit
4 years, 5 months
[gstreamer: 87/222] - Add the rpm scripts install in /usr/lib/rpm, not under libdir on 64-bit
by Dominik Mierzejewski
commit d1bc7d284f500581a5d254dfdd0784889be19d38
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Sep 11 19:36:47 2008 +0000
- Add the rpm scripts install in /usr/lib/rpm, not under libdir on 64-bit
gstreamer.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index aa5ddef..c73ac69 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
Name: %{gstreamer}
Version: 0.10.20
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -130,7 +130,7 @@ 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%{_libdir}/rpm/gstreamer.prov
+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
@@ -208,10 +208,13 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
-%{_libdir}/rpm/gstreamer.prov
+%{_prefix}/lib/rpm/gstreamer.prov
%{_sysconfdir}/rpm/macros.gstreamer
%changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-4
+- Add the rpm scripts install in /usr/lib/rpm, not under libdir on 64-bit
+
* Thu Sep 11 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-3
- Update filelist as well
4 years, 5 months
[gstreamer: 86/222] - Update filelist as well
by Dominik Mierzejewski
commit 3b9ec248a104ad365843a41a2bfbc0241192a0e5
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Sep 11 18:27:02 2008 +0000
- Update filelist as well
gstreamer.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index 908e22e..aa5ddef 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
Name: %{gstreamer}
Version: 0.10.20
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -209,8 +209,12 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%{_libdir}/rpm/gstreamer.prov
+%{_sysconfdir}/rpm/macros.gstreamer
%changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-3
+- Update filelist as well
+
* Thu Sep 11 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-2
- Update gstreamer provides work for the new RPM, see #438225
4 years, 5 months
[gstreamer: 85/222] - Update gstreamer provides work for the new RPM, see #438225
by Dominik Mierzejewski
commit 3708237176e571dc46b3c58c110eccdee7117e90
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Sep 11 17:56:56 2008 +0000
- Update gstreamer provides work for the new RPM, see #438225
gstreamer.spec | 8 +++++++-
macros.gstreamer | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index 7e19f4b..908e22e 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
Name: %{gstreamer}
Version: 0.10.20
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -34,6 +34,7 @@ BuildRequires: gcc-c++
# For the GStreamer RPM provides
Patch1: gstreamer-inspect-rpm-format.patch
Source1: gstreamer.prov
+Source2: macros.gstreamer
### documentation requirements
BuildRequires: python2
@@ -130,6 +131,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor}
# Add the provides script
install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/gstreamer.prov
+# Add the macros file
+install -m0644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.gstreamer
%clean
rm -rf $RPM_BUILD_ROOT
@@ -208,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/rpm/gstreamer.prov
%changelog
+* Thu Sep 11 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-2
+- Update gstreamer provides work for the new RPM, see #438225
+
* Wed Jun 18 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-1
- Update to 0.10.20
diff --git a/macros.gstreamer b/macros.gstreamer
new file mode 100644
index 0000000..0ceb49c
--- /dev/null
+++ b/macros.gstreamer
@@ -0,0 +1 @@
+%__gstreamer_provides /usr/lib/rpm/gstreamer.prov
4 years, 5 months
[gstreamer: 84/222] - Update to 0.10.20
by Dominik Mierzejewski
commit 427867dc1545658f0b810abf4863ec71c0aa4939
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Wed Jun 18 16:55:43 2008 +0000
- Update to 0.10.20
.cvsignore | 2 +-
gstreamer.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index de8ce36..b4e748a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gstreamer-0.10.19.tar.bz2
+gstreamer-0.10.20.tar.bz2
diff --git a/gstreamer.spec b/gstreamer.spec
index 02c2049..7e19f4b 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -5,8 +5,8 @@
%define _libxml2 2.4.0
Name: %{gstreamer}
-Version: 0.10.19
-Release: 3%{?dist}
+Version: 0.10.20
+Release: 1%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -208,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/rpm/gstreamer.prov
%changelog
+* Wed Jun 18 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.20-1
+- Update to 0.10.20
+
* Mon Jun 02 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.19-3
- Package more documentation (#240656)
diff --git a/sources b/sources
index b2966b0..f24e7ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12072a3168420350ea450749a3b63be8 gstreamer-0.10.19.tar.bz2
+d5af70413a65ebf855f788f965685e2b gstreamer-0.10.20.tar.bz2
4 years, 5 months
[gstreamer: 83/222] - Package more documentation (#240656)
by Dominik Mierzejewski
commit 0c7ae6fec6ffc2007d270220751317edc7a74ebb
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Mon Jun 2 11:46:25 2008 +0000
- Package more documentation (#240656)
gstreamer.spec | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index 2a64e3d..02c2049 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,7 +6,7 @@
Name: %{gstreamer}
Version: 0.10.19
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
@@ -36,20 +36,19 @@ Patch1: gstreamer-inspect-rpm-format.patch
Source1: gstreamer.prov
### documentation requirements
-### not needed currrently
-# BuildRequires: python2
-# BuildRequires: openjade
-# BuildRequires: jadetex
-# BuildRequires: libxslt
-# BuildRequires: docbook-style-dsssl
-# BuildRequires: docbook-style-xsl
-# BuildRequires: docbook-utils
-# BuildRequires: transfig
-# BuildRequires: xfig
-# BuildRequires: netpbm-progs
-# BuildRequires: tetex-dvips
-# BuildRequires: ghostscript
-# BuildRequires: PyXML
+BuildRequires: python2
+BuildRequires: openjade
+BuildRequires: jadetex
+BuildRequires: libxslt
+BuildRequires: docbook-style-dsssl
+BuildRequires: docbook-style-xsl
+BuildRequires: docbook-utils
+BuildRequires: transfig
+BuildRequires: xfig
+BuildRequires: netpbm-progs
+BuildRequires: tetex-dvips
+BuildRequires: ghostscript
+BuildRequires: PyXML
%description
GStreamer is a streaming media framework, based on graphs of filters which
@@ -107,8 +106,8 @@ popd
%configure \
--with-package-name='Fedora Core gstreamer package' \
--with-package-origin='http://download.fedora.redhat.com/fedora' \
+ --enable-gtk-doc \
--enable-debug \
- --disable-gtk-doc --disable-docbook \
--disable-tests --disable-examples
#make %{?_smp_mflags}
@@ -123,7 +122,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
%find_lang gstreamer-%{majorminor}
# Clean out files that should not be part of the rpm.
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor}
rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -203,13 +201,16 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/gstreamer-dataprotocol-%{majorminor}.pc
%{_libdir}/pkgconfig/gstreamer-net-%{majorminor}.pc
-%doc %{_datadir}/gtk-doc/html/gstreamer-%{majorminor}/*
-%doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}/*
-%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
+%doc %{_datadir}/gtk-doc/html/gstreamer-%{majorminor}
+%doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}
+%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}
%{_libdir}/rpm/gstreamer.prov
%changelog
+* Mon Jun 02 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.19-3
+- Package more documentation (#240656)
+
* Wed May 21 2008 - Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.10.19-2
- fix license tag
4 years, 5 months
[gstreamer: 82/222] fix license tag
by Dominik Mierzejewski
commit 4a0c7e47e886e16657091c56a3886537cb421e20
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed May 21 17:00:29 2008 +0000
fix license tag
gstreamer.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gstreamer.spec b/gstreamer.spec
index e7bf87b..2a64e3d 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -6,11 +6,11 @@
Name: %{gstreamer}
Version: 0.10.19
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer streaming media framework runtime
Group: Applications/Multimedia
-License: LGPL
+License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -210,6 +210,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/rpm/gstreamer.prov
%changelog
+* Wed May 21 2008 - Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.10.19-2
+- fix license tag
+
* Fri Apr 04 2008 - Bastien Nocera <bnocera(a)redhat.com> - 0.10.19-1
- Update to 0.10.19
4 years, 5 months