X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gstreamer.spec;h=5b98c5f0b8d67aa835320f3b4f2133f7386dd641;hb=06b3398132ef2bd2054cb50673ef5339c1be1316;hp=5fe4b29ea36c2d7bf1523905b4a7d9500f652b19;hpb=a693ae437fe2622cfae40246fc54c20f78efaaee;p=packages%2Fgstreamer.git

diff --git a/gstreamer.spec b/gstreamer.spec
index 5fe4b29..5b98c5f 100644
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -1,14 +1,13 @@
 Summary:	GStreamer Streaming-media framework runtime
 Summary(pl.UTF-8):	GStreamer - biblioteki środowiska do obróbki strumieni
 Name:		gstreamer
-Version:	0.10.21
-Release:	4
+Version:	0.10.22
+Release:	3
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://gstreamer.freedesktop.org/src/gstreamer/%{name}-%{version}.tar.bz2
-# Source0-md5:	7bad90af3fd81a1535363cf85359125c
+# Source0-md5:	35dd8598837af4074753afe5b59e8ef2
 Source1:	%{name}-rpmdeps.sh
-Source2:	%{name}-rpmmacros
 Patch0:		%{name}-without_ps_pdf.patch
 Patch1:		%{name}-eps.patch
 Patch2:		%{name}-inspect-rpm-format.patch
@@ -65,6 +64,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.12.0
 Requires:	libxml2-devel >= 1:2.6.26
 Requires:	popt-devel >= 1.6.3
+Obsoletes:	gstreamer-plugins-bad-devel < 0.10.10
 
 %description devel
 This package contains the includes files necessary to develop
@@ -102,7 +102,7 @@ Dokumentacja API Gstreamera.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
+%patch2 -p1
 
 %build
 # po/Makefile.in.in is modified
@@ -130,7 +130,6 @@ install -d $RPM_BUILD_ROOT{%{_docdir}/%{name}-devel-%{version},%{rpmlibdir}}
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{rpmlibdir}/gstreamerdeps.sh
-install %{SOURCE2} $RPM_BUILD_ROOT%{rpmlibdir}/macros.gstreamer
 
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-{%{vmajor},%{version}}
 mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{manual,pwg} \
@@ -192,7 +191,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/gstreamer-net-0.10.pc
 %{_aclocaldir}/gst-element-check-0.10.m4
 %attr(755,root,root) %{rpmlibdir}/gstreamerdeps.sh
-%{rpmlibdir}/macros.gstreamer
 
 %files static
 %defattr(644,root,root,755)