summaryrefslogtreecommitdiffstats
path: root/gst-plugins.spec.in
diff options
context:
space:
mode:
Diffstat (limited to 'gst-plugins.spec.in')
-rw-r--r--gst-plugins.spec.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index b12288c4..bf1f5883 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -17,6 +17,7 @@ Prefix: %prefix
Requires: libxml2 >= 2.4.0
Requires: gstreamer >= %{ver}
BuildRequires: nasm => 0.90
+BuildRequires: gstreamer-devel > 0.3.0
%description
GStreamer is a streaming-media framework, based on graphs of filters which
@@ -289,9 +290,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-vfs2 > 1.9.4.90
+@USE_GNOME_VFS_TRUE@Requires: gnome-vfs2 > 1.9.4.00
@USE_GNOME_VFS_TRUE@Requires: gstreamer >= %{ver}
-@USE_GNOME_VFS_TRUE@BuildRequires: gnome-vfs2-devel > 1.9.4.90
+@USE_GNOME_VFS_TRUE@BuildRequires: gnome-vfs2-devel > 1.9.4.00
@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,7 +769,6 @@ 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
@@ -784,8 +784,6 @@ Various plugins for visual effects to use with audio. Included are Smoothwave, S
@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