summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2002-01-31 15:28:21 +0000
committerChristian Schaller <uraeus@gnome.org>2002-01-31 15:28:21 +0000
commit68d8835b8f1776d1b9752abe356c0237180ec797 (patch)
tree65dc72d518e058f2585ee7f608d23a6d6acb1fcb
parente997007aec09302c0cfea130c6c54536741bcb26 (diff)
downloadgst-plugins-bad-68d8835b8f1776d1b9752abe356c0237180ec797.tar.gz
gst-plugins-bad-68d8835b8f1776d1b9752abe356c0237180ec797.tar.bz2
gst-plugins-bad-68d8835b8f1776d1b9752abe356c0237180ec797.zip
update libxml and gnome-vfs to libxml2 and gnome-vfs2
Original commit message from CVS: update libxml and gnome-vfs to libxml2 and gnome-vfs2
-rw-r--r--gst-plugins.spec.in24
1 files changed, 21 insertions, 3 deletions
diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index 1493321e..34fe22c6 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -14,7 +14,7 @@ Source: %{name}-%{ver}.tar.gz
BuildRoot: /var/tmp/%{name}-%{ver}-root
Docdir: %{prefix}/doc
Prefix: %prefix
-Requires: libxml >= 1.8.0
+Requires: libxml2 >= 2.4.0
Requires: gstreamer >= %{ver}
BuildRequires: nasm => 0.90
@@ -289,9 +289,9 @@ make prefix=$RPM_BUILD_ROOT%{prefix} install
@USE_GNOME_VFS_TRUE@%package -n gstreamer-gnomevfs
@USE_GNOME_VFS_TRUE@Summary: GStreamer plugins for GNOME VFS input and output
@USE_GNOME_VFS_TRUE@Group: Libraries/Multimedia
-@USE_GNOME_VFS_TRUE@Requires: gnome-vfs > 1.0
+@USE_GNOME_VFS_TRUE@Requires: gnome-vfs2 > 1.9.4.90
@USE_GNOME_VFS_TRUE@Requires: gstreamer >= %{ver}
-@USE_GNOME_VFS_TRUE@BuildRequires: gnome-vfs-devel > 1.0
+@USE_GNOME_VFS_TRUE@BuildRequires: gnome-vfs2-devel > 1.9.4.90
@USE_GNOME_VFS_TRUE@
@USE_GNOME_VFS_TRUE@%description -n gstreamer-gnomevfs
@USE_GNOME_VFS_TRUE@Plugins for reading and writing through GNOME VFS.
@@ -768,6 +768,24 @@ Various plugins for visual effects to use with audio. Included are Smoothwave, S
%post -n gstreamer-visualisation
%{prefix}/bin/gst-register --gst-mask=0
+<<<<<<< gst-plugins.spec.in
+@USE_LIBMMX_TRUE@%package -n gstreamer-jpegmmx
+@USE_LIBMMX_TRUE@Summary: Gstreamer mjpegtools
+@USE_LIBMMX_TRUE@Group: Libraries/Multimedia
+@USE_LIBMMX_TRUE@Requires: gstreamer >= %{ver}
+
+@USE_LIBMMX_TRUE@%description -n gstreamer-jpegmmx
+@USE_LIBMMX_TRUE@Mgpegtools based encoding and decoding plugin
+
+@USE_LIBMMX_TRUE@%files -n gstreamer-jpegmmx
+@USE_LIBMMX_TRUE@%defattr(-, root, root)
+@USE_LIBMMX_TRUE@%{prefix}/lib/gst/libgstjpegmmx*
+
+@USE_LIBMMX_TRUE@%post -n gstreamer-jpegmmx
+@USE_LIBMMX_TRUE@%{prefix}/bin/gst-register --gst-mask=0
+
+=======
+>>>>>>> 1.34
%package -n gstreamer-plugin-libs
Summary: GStreamer support libraries
Group: Libraries/Multimedia