Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gstreamer.spec.in

diff --git a/gstreamer.spec.in b/gstreamer.spec.in
index 7a542fd..70c4d3b 100644 (file)
--- a/gstreamer.spec.in
+++ b/gstreamer.spec.in
@@ -1,8 +1,7 @@
-%define                gstreamer       gstreamer
+%define                gstreamer       gstreamer011
 %define                majorminor      @GST_MAJORMINOR@
 
 %define        _glib2          @GLIB_REQ@
-%define        _libxml2        @LIBXML2_REQ@
 
 Name:          %{gstreamer}
 Version:       @VERSION@
@@ -15,12 +14,7 @@ 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)
 
-Requires:      gstreamer-tools >= %{version}
-# gst-feedback uses these
-Requires:      which, pkgconfig
-
 BuildRequires:         glib2-devel >= %{_glib2}
-BuildRequires:         libxml2-devel >= %{_libxml2}
 BuildRequires:         bison
 BuildRequires:         flex
 BuildRequires:         m4
@@ -60,7 +54,6 @@ Group:                Development/Libraries
 
 Requires:      %{name} = %{version}-%{release}
 Requires:      glib2-devel >= %{_glib2}
-Requires:      libxml2-devel >= %{_libxml2}
 Requires:      check-devel
 
 %description devel
@@ -75,28 +68,13 @@ This package contains the libraries and includes files necessary to develop
 applications and plugins for GStreamer, as well as general and API
 documentation.
 
-%package -n gstreamer-tools
-Summary:       common tools and files for GStreamer streaming media framework
-Group:                 Applications/Multimedia
-
-%description -n gstreamer-tools
-GStreamer is a streaming media framework, based on graphs of filters which
-operate on media data. Applications using this library can do anything
-from real-time sound processing to playing videos, and just about anything
-else media-related.  Its plugin-based architecture means that new data
-types or processing capabilities can be added simply by installing new   
-plugins.
-
-This package contains wrapper scripts for the command-line tools that work
-with different major/minor versions of GStreamer.
-
 %prep
 %setup -q -n gstreamer-%{version}
 
 %build
 # 0.10.0: manuals do not build due to an openjade error; disable for now
 %configure \
-  --with-package-name='CVS gstreamer package' \
+  --with-package-name='gstreamer package' \
   --with-package-origin='http://gstreamer.freedesktop.org' \
   --enable-debug \
   --enable-gtk-doc \
@@ -143,41 +121,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcoreindexers.so
 
-%{_bindir}/gst-feedback-%{majorminor}
 %{_bindir}/gst-inspect-%{majorminor}
 %{_bindir}/gst-launch-%{majorminor}
 %{_bindir}/gst-typefind-%{majorminor}
-%{_bindir}/gst-xmlinspect-%{majorminor}
-%{_bindir}/gst-xmllaunch-%{majorminor}
 %{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
-%doc %{_mandir}/man1/gst-feedback-%{majorminor}.*
 %doc %{_mandir}/man1/gst-inspect-%{majorminor}.*
 %doc %{_mandir}/man1/gst-launch-%{majorminor}.*
 %doc %{_mandir}/man1/gst-typefind-%{majorminor}.*
-%doc %{_mandir}/man1/gst-xmlinspect-%{majorminor}.*
-%doc %{_mandir}/man1/gst-xmllaunch-%{majorminor}.*
 %doc %{_datadir}/doc/gstreamer-%{majorminor}/manual
 %doc %{_datadir}/doc/gstreamer-%{majorminor}/pwg
 %doc %{_datadir}/doc/gstreamer-%{majorminor}/faq/
-%{_libdir}/girepository-1.0/Gst-0.10.typelib
-%{_libdir}/girepository-1.0/GstBase-0.10.typelib
-%{_libdir}/girepository-1.0/GstCheck-0.10.typelib
-%{_libdir}/girepository-1.0/GstController-0.10.typelib
-%{_libdir}/girepository-1.0/GstNet-0.10.typelib
-%{_datadir}/gir-1.0/Gst-0.10.gir
-%{_datadir}/gir-1.0/GstBase-0.10.gir
-%{_datadir}/gir-1.0/GstCheck-0.10.gir
-%{_datadir}/gir-1.0/GstController-0.10.gir
-%{_datadir}/gir-1.0/GstNet-0.10.gir
-
-%files -n gstreamer-tools
-%defattr(-, root, root, -)
-%{_bindir}/gst-feedback
-%{_bindir}/gst-inspect
-%{_bindir}/gst-launch
-%{_bindir}/gst-typefind
-%{_bindir}/gst-xmlinspect
-%{_bindir}/gst-xmllaunch
+%{_libdir}/girepository-1.0/Gst-%{majorminor}.typelib
+%{_libdir}/girepository-1.0/GstBase-%{majorminor}.typelib
+%{_libdir}/girepository-1.0/GstCheck-%{majorminor}.typelib
+%{_libdir}/girepository-1.0/GstController-%{majorminor}.typelib
+%{_libdir}/girepository-1.0/GstNet-%{majorminor}.typelib
+%{_datadir}/gir-1.0/Gst-%{majorminor}.gir
+%{_datadir}/gir-1.0/GstBase-%{majorminor}.gir
+%{_datadir}/gir-1.0/GstCheck-%{majorminor}.gir
+%{_datadir}/gir-1.0/GstController-%{majorminor}.gir
+%{_datadir}/gir-1.0/GstNet-%{majorminor}.gir
 
 %files devel
 %defattr(-, root, root, -)
@@ -211,6 +174,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/*
 
 %changelog
+* Sat Aug 06 2011 Thomas Vander Stichele <thomas at apestaart dot org>
+- Use majorminor correctly for .gir files
+- Remove gstreamer-tools completely since the unversioned tools have been
+  removed
+- Rename package to gstreamer011 to be parallel-installable
+
 * Thu Apr 3 2008 Christian Schaller <christian.schaller at collabora co uk>
 - Update spec file to make inclusion of all docs explicit