added missing patch to fix type errors

Change-Id: I096547d30ba778af5989ec41710af317574ef1a2

diff --git a/packaging/clutter.changes b/packaging/clutter.changes
index 6cb84e9..d9b90fe 100644 (file)
--- a/packaging/clutter.changes
+++ b/packaging/clutter.changes
@@ -1,5 +1,11 @@
-* Wed May 30 - Zhang Qiang <qiang.z.zhang@intel.con> - 1.10.0
-- Clean up spec file for packaging
+* Wed May 30 2012 Anas Nashif <anas.nashif@intel.com> 20120504.0@5c80f11
+- added missing patch to fix type errors
+[ Zhang Qiang ]
+- cleanup specfile for packaging
 
-* Fri May 04 2012 Lin Yang <lin.a.yang@intel.com>
+* Fri May 04 2012 Yang Lin <lin.a.yang@intel.com> 20120504.0@686cc9e
 - test release infrastructure
+
+* Fri Apr 27 2012 Prajwal Mohan <prajwal.karur.mohan@intel.com> 20120504.0@d6b2741
+- Initial Import
+

diff --git a/packaging/clutter.spec b/packaging/clutter.spec
index addf557..68034e3 100644 (file)
--- a/packaging/clutter.spec
+++ b/packaging/clutter.spec
@@ -1,57 +1,56 @@
-Name:       clutter
-Summary:    Open Source software library for creating rich graphical user interfaces
-Version:    1.10.4
-Release:    1
-Group:      System/Libraries
-License:    LGPLv2+
-URL:        http://www.clutter-project.org/
-Source0:    http://source.clutter-project.org/sources/clutter/1.10/clutter-%{version}.tar.bz2
-Patch0: 0001-Don-t-use-any-GL-types-or-defines-in-Clutter.patch
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Name:           clutter
+Version:        1.10.4
+Release:        1
+License:        LGPL-2.0+
+Summary:        Open Source software library for creating rich graphical user interfaces
+Url:            http://www.clutter-project.org/
+Group:          System/Libraries
+Source0:        http://source.clutter-project.org/sources/clutter/1.10/clutter-%{version}.tar.bz2
+Patch0:         0001-Don-t-use-any-GL-types-or-defines-in-Clutter.patch
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  pkgconfig(atk) >= 2.1.5
+BuildRequires:  pkgconfig(cogl-1.0) >= 1.9.6
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(json-glib-1.0) >= 0.12.0
 BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcomposite)
 BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glesv2)
-BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
-BuildRequires:  pkgconfig(atk) >= 2.1.5
-BuildRequires:  pkgconfig(cogl-1.0) >= 1.9.6
-BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  intltool
-BuildRequires:  gettext
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description
-Clutter is an open source software library for creating fast, visually rich graphical user interfaces. The most obvious example of potential usage is in media center type applications. We hope however it can be used for a lot more.
-
-
+Clutter is an open source software library for creating fast, visually rich
+graphical user interfaces. The most obvious example of potential usage is in
+media center type applications. We hope however it can be used for a lot more.
 
 %package devel
-Summary:    Clutter header files and development libraries
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+Summary:        Clutter header files and development libraries
+Group:          Development/Libraries
+Requires:       %{name} = %{version}
 
 %description devel
 Development environment for Clutter
 
 %package doc
-Summary:    Clutter API reference
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires:   gtk-doc
+Summary:        Clutter API reference
+Group:          Development/Libraries
+Requires:       %{name} = %{version}
+Requires:       gtk-doc
 
 %description doc
 Documentation for Clutter
 
-
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1
 
 %build
@@ -62,10 +61,9 @@ Documentation for Clutter
     --enable-wayland-backend \
     --enable-introspection=no
 
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
 %make_install
 
 %find_lang clutter-1.0
@@ -76,29 +74,17 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-
-
-
-
-
-
-
 %files -f clutter-1.0.lang
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/lib*.so.*
 
 
-
 %files devel
-%defattr(-,root,root,-)
 %doc ChangeLog NEWS README
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
-
 %files doc
-%defattr(-,root,root,-)
 %doc %{_datadir}/gtk-doc/html/*