X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=clutter.spec;h=3d8e5ac200e7d1c61ac7b2966ae84e60304fb1c4;hb=f2709341a198ff0709def963f8cb182e8d4ca9d7;hp=e7b09091bc4d26477303ddd05641333fbf3931a0;hpb=23fddd115f841b4fa58e73abe8f7db11cd8b9e62;p=packages%2Fclutter.git

diff --git a/clutter.spec b/clutter.spec
index e7b0909..3d8e5ac 100644
--- a/clutter.spec
+++ b/clutter.spec
@@ -1,23 +1,26 @@
 Summary:	Library for rich GUIs
 Summary(pl.UTF-8):	Biblioteka do bogatych graficznych interfejsów użytkownika
 Name:		clutter
-Version:	0.8.8
-Release:	2
+Version:	1.0.4
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://www.clutter-project.org/sources/clutter/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	20f9ab406a9fa261a0a3379eb6f43625
+Source0:	http://www.clutter-project.org/sources/clutter/1.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	7e587d9406e362ea1151a81d37d5460c
 URL:		http://www.clutter-project.org/
 BuildRequires:	OpenGL-GLX-devel
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	glib2-devel >= 1:2.10
+BuildRequires:	cairo-devel >= 1.6
+BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	gtk+2-devel >= 1:2.0
 BuildRequires:	gtk-doc >= 1.8
 BuildRequires:	libtool
+BuildRequires:	pango-devel >= 1:1.20
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXfixes-devel >= 4
+Obsoletes:	clutter-cairo < 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,6 +55,7 @@ Requires:	glib2-devel >= 1:2.10
 Requires:	gtk+2-devel >= 1:2.0
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXfixes-devel >= 4
+Obsoletes:	clutter-cairo-devel < 1.0
 
 %description devel
 Header files for clutter library.
@@ -64,6 +68,7 @@ Summary:	Static clutter library
 Summary(pl.UTF-8):	Statyczna biblioteka clutter
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Obsoletes:	clutter-cairo-static < 1.0
 
 %description static
 Static clutter library.
@@ -89,7 +94,7 @@ Dokumentacja API clutter.
 %build
 %{__gtkdocize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I build/autotools
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -97,8 +102,7 @@ Dokumentacja API clutter.
 	--enable-gtk-doc \
 	--enable-static \
 	--with-html-dir=%{_gtkdocdir}
-
-%{__make}
+%{__make} -j 1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -115,21 +119,25 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_libdir}/libclutter-glx-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclutter-glx-0.8.so.0
+%attr(755,root,root) %{_libdir}/libclutter-glx-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclutter-glx-1.0.so.0
+%{_libdir}/girepository-1.0/*.typelib
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclutter-glx-0.8.so
-%{_libdir}/libclutter-glx-0.8.la
-%{_includedir}/clutter-0.8
-%{_pkgconfigdir}/clutter-0.8.pc
-%{_pkgconfigdir}/clutter-glx-0.8.pc
-%{_pkgconfigdir}/clutter-x11-0.8.pc
+%attr(755,root,root) %{_libdir}/libclutter-glx-1.0.so
+%{_libdir}/libclutter-glx-1.0.la
+%{_includedir}/clutter-1.0
+%{_datadir}/gir-1.0/*.gir
+%{_pkgconfigdir}/clutter-1.0.pc
+%{_pkgconfigdir}/clutter-glx-1.0.pc
+%{_pkgconfigdir}/clutter-x11-1.0.pc
+%{_pkgconfigdir}/cogl-1.0.pc
+%{_pkgconfigdir}/cogl-gl-1.0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libclutter-glx-0.8.a
+%{_libdir}/libclutter-glx-1.0.a
 
 %files apidocs
 %defattr(644,root,root,755)