From 709280c0eb3423e3d3133618219af9b8a438d16a Mon Sep 17 00:00:00 2001 From: Allisson Azevedo Date: Sun, 7 Sep 2008 04:13:21 +0000 Subject: [PATCH] Update to 0.8.0 --- .cvsignore | 2 +- clutter-0.8.0-clutter-fixed.patch | 21 ++++++++++++++++++++ clutter.spec | 33 +++++++++++++++++-------------- import.log | 1 + sources | 2 +- 5 files changed, 42 insertions(+), 17 deletions(-) create mode 100644 clutter-0.8.0-clutter-fixed.patch diff --git a/.cvsignore b/.cvsignore index e89a87c..e64c49e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clutter-0.6.4.tar.gz +clutter-0.8.0.tar.gz diff --git a/clutter-0.8.0-clutter-fixed.patch b/clutter-0.8.0-clutter-fixed.patch new file mode 100644 index 0000000..e2498fc --- /dev/null +++ b/clutter-0.8.0-clutter-fixed.patch @@ -0,0 +1,21 @@ +diff -up clutter-0.8.0/clutter/clutter-fixed.c.orig clutter-0.8.0/clutter/clutter-fixed.c +--- clutter-0.8.0/clutter/clutter-fixed.c.orig 2008-09-06 16:37:07.000000000 -0300 ++++ clutter-0.8.0/clutter/clutter-fixed.c 2008-09-06 16:37:27.000000000 -0300 +@@ -23,6 +23,8 @@ + * Boston, MA 02111-1307, USA. + */ + ++#define G_IMPLEMENT_INLINES ++ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -30,7 +32,6 @@ + #include + #include + +-#define G_IMPLEMENTS_INLINES + #include "clutter-fixed.h" + #include "clutter-private.h" + +diff -up clutter-0.8.0/clutter/clutter-fixed.h.orig clutter-0.8.0/clutter/clutter-fixed.h diff --git a/clutter.spec b/clutter.spec index b37c05a..14f44d5 100644 --- a/clutter.spec +++ b/clutter.spec @@ -1,16 +1,17 @@ Name: clutter -Version: 0.6.4 +Version: 0.8.0 Release: 1%{?dist} Summary: Open Source software library for creating rich graphical user interfaces Group: Development/Libraries License: LGPLv2+ URL: http://www.clutter-project.org/ -Source0: http://www.clutter-project.org/sources/%{name}/0.6/%{name}-%{version}.tar.gz +Source0: http://www.clutter-project.org/sources/%{name}/0.8/%{name}-%{version}.tar.gz +Patch0: clutter-0.8.0-clutter-fixed.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glib2-devel mesa-libGL-devel gtk2-devel -BuildRequires: pkgconfig pango-devel +BuildRequires: glib2-devel mesa-libGL-devel gtk2-devel pkgconfig pango-devel +BuildRequires: libXdamage-devel gettext gtk-doc %description Clutter is an open source software library for creating fast, @@ -29,16 +30,14 @@ Requires: mesa-libGL-devel Header files and libraries for building a extension library for the clutter - %prep %setup -q - +%patch0 -p1 -b .orig %build -%configure +%configure --enable-gtk-doc make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT #make DESTDIR=$RPM_BUILD_ROOT install @@ -54,20 +53,24 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %exclude %{_libdir}/*.la -%{_libdir}/libclutter-glx-0.6.so.0 -%{_libdir}/libclutter-glx-0.6.so.0.* - +%{_libdir}/libclutter-glx-0.8.so.0 +%{_libdir}/libclutter-glx-0.8.so.0.* %files devel %defattr(-, root, root) %{_includedir}/* -%{_libdir}/libclutter-glx-0.6.so -%{_libdir}/pkgconfig/clutter-0.6.pc -%{_libdir}/pkgconfig/clutter-glx-0.6.pc -%{_libdir}/pkgconfig/clutter-x11-0.6.pc +%{_libdir}/libclutter-glx-0.8.so +%{_libdir}/pkgconfig/clutter-0.8.pc +%{_libdir}/pkgconfig/clutter-glx-0.8.pc +%{_libdir}/pkgconfig/clutter-x11-0.8.pc +%{_datadir}/gtk-doc/html/clutter +%exclude %{_datadir}/gtk-doc/html/cogl %changelog +* Sat Sep 6 2008 Allisson Azevedo 0.8.0-1 +- Update to 0.8.0 + * Sat Jun 14 2008 Allisson Azevedo 0.6.4-1 - Update to 0.6.4 diff --git a/import.log b/import.log index 193f234..58ab3b0 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ clutter-0_6_4-1_fc9:HEAD:clutter-0.6.4-1.fc9.src.rpm:1213453978 +clutter-0_8_0-1_fc9:HEAD:clutter-0.8.0-1.fc9.src.rpm:1220760678 diff --git a/sources b/sources index 74c6e2f..2a531e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d28dec49517475c2ea0de884d7b87268 clutter-0.6.4.tar.gz +ec7be7de08d7d52660231566a14df5c0 clutter-0.8.0.tar.gz