- merge from DEVEL

Changed files:
    clutter-gst-link.patch -> 1.3
    clutter-gst-ver.patch -> 1.3
    clutter-gst.spec -> 1.21

diff --git a/clutter-gst-link.patch b/clutter-gst-link.patch
deleted file mode 100644 (file)
index 011f9fe..0000000
--- a/clutter-gst-link.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN clutter-gst-0.10.0/configure.ac clutter-gst-0.10.0.new/configure.ac
---- clutter-gst-0.10.0/configure.ac    2009-07-29 12:12:32.000000000 +0200
-+++ clutter-gst-0.10.0.new/configure.ac        2009-11-08 19:09:21.728006779 +0100
-@@ -107,11 +107,9 @@
- 
- GST_MAJORMINOR=0.10
- 
--pkg_modules="gstreamer-$GST_MAJORMINOR gstreamer-plugins-base-$GST_MAJORMINOR gstreamer-base-$GST_MAJORMINOR"
-+pkg_modules="gstreamer-$GST_MAJORMINOR gstreamer-base-$GST_MAJORMINOR"
- PKG_CHECK_MODULES(GST, [$pkg_modules])
- 
--GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR"
--
- dnl ========================================================================
- 
- m4_define([maintainer_flags_default], [yes])

diff --git a/clutter-gst-ver.patch b/clutter-gst-ver.patch
deleted file mode 100644 (file)
index a9b7cbf..0000000
--- a/clutter-gst-ver.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- clutter-gst-1.2.0/configure.ac.orig        2011-01-07 22:10:23.813904043 +0100
-+++ clutter-gst-1.2.0/configure.ac     2011-01-08 08:16:16.677899853 +0100
-@@ -103,7 +103,7 @@
- 
- dnl ========================================================================
- 
--pkg_modules="clutter-1.0 < 1.3.0 gio-2.0"
-+pkg_modules="clutter-1.0 >= 1.2.0 gio-2.0"
- PKG_CHECK_MODULES(CLUTTER_GST, [$pkg_modules])
- 
- dnl ========================================================================
---- clutter-gst-1.2.0/clutter-gst.pc.in.orig   2010-08-18 12:38:02.000000000 +0200
-+++ clutter-gst-1.2.0/clutter-gst.pc.in        2011-01-13 18:28:50.286356589 +0100
-@@ -8,5 +8,5 @@
- Version: @VERSION@
- Libs: -L${libdir} -lclutter-gst-@CLUTTER_GST_MAJORMINOR@ 
- Cflags: -I${includedir}/clutter-@CLUTTER_API_VERSION@
--Requires: clutter-@CLUTTER_API_VERSION@ < 1.3.0 gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10
-+Requires: clutter-@CLUTTER_API_VERSION@ >= 1.2.0 gstreamer-0.10 gstreamer-base-0.10 gstreamer-plugins-base-0.10
- Requires.private: gio-2.0

diff --git a/clutter-gst.spec b/clutter-gst.spec
index b4a3e276e067c6e7493ba4656ebce2503a96ea27..65e7649402d465b4d98897894b5c7a062ed5fefa 100644 (file)
--- a/clutter-gst.spec
+++ b/clutter-gst.spec
@@ -1,28 +1,27 @@
 Summary:       Library integrating clutter with GStreamer
 Summary(pl.UTF-8):     Biblioteka integrująca clutter z GStreamerem
 Name:          clutter-gst
-Version:       1.2.0
-Release:       2
+Version:       1.3.14
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://source.clutter-project.org/sources/clutter-gst/1.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 1048815f0c9152edbfdc59a94d0e3b87
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-ver.patch
+Source0:       http://source.clutter-project.org/sources/clutter-gst/1.3/%{name}-%{version}.tar.bz2
+# Source0-md5: 5cd03bbf6d8905a62f9d3de1263bd74c
 URL:           http://www.clutter-project.org/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.9
-BuildRequires: clutter-devel >= 1.2.0
+BuildRequires: clutter-devel >= 1.4.0
 BuildRequires: docbook-dtd412-xml
 BuildRequires: glibc-misc
 BuildRequires: gobject-introspection-devel >= 0.6.8
 BuildRequires: gstreamer-devel >= 0.10
 BuildRequires: gstreamer-plugins-base-devel >= 0.10
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: libtool
 BuildRequires: pkgconfig
 BuildRequires: python
-Requires:      clutter >= 1.2.0
+Requires:      clutter >= 1.4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,7 +35,7 @@ Summary:      Header files for clutter-gst library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki clutter-gst
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      clutter-devel >= 1.2.0
+Requires:      clutter-devel >= 1.4.0
 Requires:      gstreamer-devel >= 0.10
 Requires:      gstreamer-plugins-base-devel >= 0.10
 
@@ -72,8 +71,6 @@ Dokumentacja API clutter-gst.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -106,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %attr(755,root,root) %{_libdir}/libclutter-gst-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libclutter-gst-1.0.so.0
 %{_libdir}/girepository-1.0/ClutterGst-1.0.typelib