- merge from HEAD revision 1.8, version 0.10.5

- adjusted deps for Ac

Changed files:
    gstreamer-plugins-ugly.spec -> 1.5.2.3

diff --git a/gstreamer-plugins-ugly.spec b/gstreamer-plugins-ugly.spec
index 5308f7b6e648377779c14e55b5fdc10f3dce66e1..cf9c1190be64c7a3015b27e77143bb9319455666 100644 (file)
--- a/gstreamer-plugins-ugly.spec
+++ b/gstreamer-plugins-ugly.spec
@@ -1,36 +1,39 @@
 #
 # Conditional build:
 %bcond_without sid             # don't build sid plugin
+%bcond_with    amr             # AMR-NB plugin
 #
 %define                gstname         gst-plugins-ugly
 %define                gst_major_ver   0.10
-%define                gst_req_ver     0.10.3
+%define                gst_req_ver     0.10.11
 #
 Summary:       Ugly GStreamer Streaming-media framework plugins
 Summary(pl):   Brzydkie wtyczki do ¶rodowiska obróbki strumieni GStreamer
 Name:          gstreamer-plugins-ugly
-Version:       0.10.3
-Release:       2
+Version:       0.10.5
+Release:       1
 License:       LGPL
 Group:         Libraries
 Source0:       http://gstreamer.freedesktop.org/src/gst-plugins-ugly/%{gstname}-%{version}.tar.bz2
-# Source0-md5: af6f238507b0040bf84fcbc6a241e559
+# Source0-md5: 2e6bf35ebcb2ab508b43ef3aaee878ad
 Patch0:                %{name}-bashish.patch
 URL:           http://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1.5
-BuildRequires: glib2-devel >= 1:2.6.0
+BuildRequires: glib2-devel >= 1:2.10.3
 BuildRequires: gstreamer-devel >= %{gst_req_ver}
 BuildRequires: gstreamer-plugins-base-devel >= %{gst_req_ver}
-BuildRequires: gtk-doc >= 1.3
-BuildRequires: liboil-devel >= 1:0.3.6
+BuildRequires: gtk-doc >= 1.7
+BuildRequires: liboil-devel >= 0.3.9
 BuildRequires: libtool >= 1.4
 BuildRequires: pkgconfig >= 1:0.9.0
+BuildRequires: python >= 2.1
+BuildRequires: python-PyXML
 ##
 ## plugins
 ##
 BuildRequires: a52dec-libs-devel
-BuildRequires: amrnb-devel
+%{?with_amr:BuildRequires:     amrnb-devel}
 BuildRequires: lame-libs-devel
 BuildRequires: libdvdread-devel
 BuildRequires: libid3tag-devel >= 0.15
@@ -91,6 +94,8 @@ Wtyczka dekoduj
 Summary:       GStreamer plugin for DVD playback
 Summary(pl):   Wtyczka do GStreamera odtwarzaj±ca DVD
 Group:         Libraries
+# for NLS (when non-empty *.mo appear)
+#Requires:     %{name} = %{version}-%{release}
 Requires:      gstreamer >= %{gst_req_ver}
 Obsoletes:     gstreamer-libdvdread
 
@@ -156,6 +161,7 @@ Wtyczka do odtwarzania plik
 %{__autoheader}
 %{__automake}
 %configure \
+       %{!?with_amr:--disable-amrnb} \
        %{!?with_sid:--disable-sidplay} \
        --disable-static \
        --enable-gtk-doc \
@@ -172,10 +178,13 @@ rm -rf $RPM_BUILD_ROOT
 # We don't need plugins' *.la files
 rm -f $RPM_BUILD_ROOT%{gstlibdir}/*.la
 
+#%find_lang %{gstname}-%{gst_major_ver}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
+# -f %{gstname}-%{gst_major_ver}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README RELEASE
 %attr(755,root,root) %{gstlibdir}/libgstasf.so
@@ -193,9 +202,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gstlibdir}/libgsta52dec.so
 
+%if %{with amr}
 %files -n gstreamer-amrnb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gstlibdir}/libgstamrnb.so
+%endif
 
 %files -n gstreamer-dvdread
 %defattr(644,root,root,755)