Backport upstream patch to fix gnome-shell crashes. Release 2

[packages/clutter.git] / clutter.spec

diff --git a/clutter.spec b/clutter.spec
index 52e8df23c8e11a3ba6a2f7982af3852a17b9eb35..6555d6f115618a513752e4a1aa3761d969e04785 100644 (file)
--- a/clutter.spec
+++ b/clutter.spec
@@ -1,32 +1,34 @@
 Summary:       Library for rich GUIs
 Summary(pl.UTF-8):     Biblioteka do bogatych graficznych interfejsów użytkownika
 Name:          clutter
-Version:       1.8.0
-Release:       1
+Version:       1.14.4
+Release:       2
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://source.clutter-project.org/sources/clutter/1.8/%{name}-%{version}.tar.xz
-# Source0-md5: f132ff798905f8430d30dc27a174fb46
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/clutter/1.14/%{name}-%{version}.tar.xz
+# Source0-md5: c072e4c27e69368f2b877ea4f6da2cdf
 Patch0:                gtkdoc.patch
 Patch1:                missing.patch
+Patch2:                clutter-bug692706.patch
 URL:           http://www.clutter-project.org/
 BuildRequires: OpenGL-GLX-devel
-BuildRequires: atk-devel >= 1:1.17
+BuildRequires: atk-devel >= 1:2.5.3
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
 BuildRequires: cairo-devel >= 1.10
 BuildRequires: cairo-gobject-devel >= 1.10
-BuildRequires: cogl-devel >= 1.8.0
+BuildRequires: cogl-devel >= 1.14.0
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.26.0
-BuildRequires: gobject-introspection-devel >= 0.9.5
-BuildRequires: gtk-doc >= 1.13
-BuildRequires: json-glib-devel >= 0.12
+BuildRequires: glib2-devel >= 1:2.32.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gtk+3-devel >= 3.4.0
+BuildRequires: gtk-doc >= 1.15
+BuildRequires: json-glib-devel >= 0.12.0
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: libxslt-progs
-BuildRequires: pango-devel >= 1:1.20
+BuildRequires: pango-devel >= 1:1.30
 BuildRequires: pkgconfig
 BuildRequires: python-modules
 BuildRequires: tar >= 1:1.22
@@ -37,11 +39,13 @@ BuildRequires:      xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXfixes-devel >= 4
 BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xz
-Requires:      atk >= 1:1.17
+Requires:      atk >= 1:2.5.3
 Requires:      cairo-gobject >= 1.10
-Requires:      glib2 >= 1:2.26.0
-Requires:      json-glib >= 0.12
-Requires:      pango >= 1:1.20
+Requires:      cogl >= 1.14.0
+Requires:      glib2 >= 1:2.32.0
+Requires:      gtk+3 >= 3.4.0
+Requires:      json-glib >= 0.12.0
+Requires:      pango >= 1:1.30
 Obsoletes:     clutter-cairo < 1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -73,13 +77,14 @@ Summary(pl.UTF-8):  Pliki nagłówkowe biblioteki clutter
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      OpenGL-GLX-devel
-Requires:      atk-devel >= 1:1.17
+Requires:      atk-devel >= 1:2.5.3
 Requires:      cairo-gobject-devel >= 1.10
-Requires:      cogl-devel >= 1.7.6
+Requires:      cogl-devel >= 1.14.0
 Requires:      gdk-pixbuf2-devel >= 2.0
-Requires:      glib2-devel >= 1:2.26.0
+Requires:      glib2-devel >= 1:2.32.0
+Requires:      gtk+3-devel >= 3.4.0
 Requires:      json-glib-devel >= 0.12.0
-Requires:      pango-devel >= 1:1.20
+Requires:      pango-devel >= 1:1.30
 Requires:      xorg-lib-libX11-devel
 Requires:      xorg-lib-libXcomposite-devel >= 0.4
 Requires:      xorg-lib-libXdamage-devel
@@ -122,6 +127,7 @@ Dokumentacja API clutter.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gtkdocize}
@@ -132,7 +138,6 @@ Dokumentacja API clutter.
 %{__automake}
 %configure \
        --disable-silent-rules \
-       --with-flavour=glx \
        --enable-docs \
        --enable-gtk-doc \
        --enable-static \
@@ -145,7 +150,13 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libclutter-glx-1.0.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libclutter-1.0.la
+
+# drop unsupported locale
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/az_IR
+
+# move to %{_examplesdir} and package in -examples?
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/clutter-1.0/cookbook/examples
 
 %find_lang clutter-1.0
 
@@ -158,28 +169,33 @@ rm -rf $RPM_BUILD_ROOT
 %files -f clutter-1.0.lang
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/libclutter-glx-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclutter-glx-1.0.so.0
+%attr(755,root,root) %{_libdir}/libclutter-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclutter-1.0.so.0
+%attr(755,root,root) %{_libdir}/libclutter-glx-1.0.so.0
 %{_libdir}/girepository-1.0/Cally-1.0.typelib
 %{_libdir}/girepository-1.0/Clutter-1.0.typelib
+%{_libdir}/girepository-1.0/ClutterGdk-1.0.typelib
 %{_libdir}/girepository-1.0/ClutterX11-1.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libclutter-1.0.so
 %attr(755,root,root) %{_libdir}/libclutter-glx-1.0.so
 %{_includedir}/clutter-1.0
 %{_datadir}/gir-1.0/Cally-1.0.gir
 %{_datadir}/gir-1.0/Clutter-1.0.gir
+%{_datadir}/gir-1.0/ClutterGdk-1.0.gir
 %{_datadir}/gir-1.0/ClutterX11-1.0.gir
 %{_pkgconfigdir}/cally-1.0.pc
 %{_pkgconfigdir}/clutter-1.0.pc
 %{_pkgconfigdir}/clutter-cogl-1.0.pc
+%{_pkgconfigdir}/clutter-gdk-1.0.pc
 %{_pkgconfigdir}/clutter-glx-1.0.pc
 %{_pkgconfigdir}/clutter-x11-1.0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libclutter-glx-1.0.a
+%{_libdir}/libclutter-1.0.a
 
 %files apidocs
 %defattr(644,root,root,755)