[meego-commits] 6497: Changes to Trunk/clutter-qt

[Anas Nashif]

Hi,
I have made the following changes to clutter-qt in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #6497:

  submit:   Trunk:Testing/clutter-qt(r4) -> Trunk/clutter-qt


Message:
    Move to Trunk

State:   new          2010-08-12T10:27:35 nashif
Comment: None



changes files:
--------------
--- clutter-qt.changes
+++ clutter-qt.changes
@@ -0,0 +1,4 @@
+* Thu Aug 12 2010 Fathi Boudra <fathi.boudra at nokia.com> - 0.9_20090720
+- Improve description
+- Add --with-moc configure option to fix build against Qt 4.7.0 beta 2
+

spec files:
-----------
--- clutter-qt.spec
+++ clutter-qt.spec
@@ -1,12 +1,12 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.15
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.18
 # 
 # >> macros
 # << macros
 
 Name:       clutter-qt
-Summary:    Clutter integration library for QT
+Summary:    Open GL based interactive canvas library for Qt
 Version:    0.9_20090720
 Release:    1
 Group:      System/Libraries
@@ -17,23 +17,34 @@
 Patch0:     clutter-1.0-dependency.patch
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  pkgconfig(gtk-doc)
-BuildRequires:  pkgconfig(QtCore)
-BuildRequires:  pkgconfig(QtGui)
 BuildRequires:  pkgconfig(clutter-1.0)
 BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gtk-doc)
+BuildRequires:  pkgconfig(QtGui)
+
 
 %description
-Description: %{summary}
+Clutter is an Open GL based interactive canvas library, designed for creating
+fast, mainly 2D single window applications such as media box UIs,
+presentations, kiosk style applications and so on.
+
+Clutter Qt is an integration library for using Clutter within Qt. It has a
+QWidget subclass that contains a Clutter stage.
+
 
 
 %package devel
-Summary:    Clutter-qt header files and development libraries
+Summary:    Clutter Qt header files and development libraries
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-Description: %{summary}
+Clutter Qt is an integration library for using Clutter within Qt. It has a
+QWidget subclass that contains a Clutter stage.
+
+This package contains the headers files needed to build Qt applications using
+Clutter Qt library.
+
 
 
 %prep
@@ -48,7 +59,9 @@
 # >> build pre
 # << build pre
 
-%autogen --disable-static
+%autogen --disable-static \
+    --with-moc=moc
+
 make %{?jobs:-j%jobs}
 
 # >> build post

other changes:
--------------

++++++ Makefile
--- Makefile
+++ Makefile
@@ -2,5 +2,5 @@
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))
 YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
 
-include /usr/share/packaging-tools/Makefile.common
+include /usr/share/meego-packaging-tools/Makefile.common
 

++++++ clutter-qt.yaml
--- clutter-qt.yaml
+++ clutter-qt.yaml
@@ -1,5 +1,5 @@
 Name: clutter-qt
-Summary: Clutter integration library for QT
+Summary: Open GL based interactive canvas library for Qt
 Version: 0.9_20090720
 Release: 1
 Group: System/Libraries
@@ -9,16 +9,28 @@
     - http://www.clutter-project.org/sources/%{name}/0.9/%{name}-%{version}.tar.bz2
 Patches:
     - clutter-1.0-dependency.patch
+Description: |
+    Clutter is an Open GL based interactive canvas library, designed for creating
+    fast, mainly 2D single window applications such as media box UIs,
+    presentations, kiosk style applications and so on.
 
+    Clutter Qt is an integration library for using Clutter within Qt. It has a
+    QWidget subclass that contains a Clutter stage.
 PkgConfigBR:
-    - gtk-doc
-    - QtCore
-    - QtGui
     - clutter-1.0
     - glib-2.0
+    - gtk-doc
+    - QtGui
 Configure: autogen
+ConfigOptions:
+    - --with-moc=moc
 SubPackages:
     - Name: devel
-      Summary: Clutter-qt header files and development libraries
+      Summary: Clutter Qt header files and development libraries
       Group: Development/Libraries
+      Description: |
+        Clutter Qt is an integration library for using Clutter within Qt. It has a
+        QWidget subclass that contains a Clutter stage.
 
+        This package contains the headers files needed to build Qt applications using
+        Clutter Qt library.