packages (DEVEL): clutter/clutter.spec, clutter/missing.patch (NEW) - up to...

Thu Feb 3 15:31:26 CET 2011

Author: wiget                        Date: Thu Feb  3 14:31:26 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to stable 1.6.0
- added missing.patch (cb_button.h missed in tarball)
- updated BRs (based on configure.ac)
- drop libtool file

---- Files affected:
packages/clutter:
   clutter.spec (1.37.2.2 -> 1.37.2.3) , missing.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/clutter/clutter.spec
diff -u packages/clutter/clutter.spec:1.37.2.2 packages/clutter/clutter.spec:1.37.2.3

--- packages/clutter/clutter.spec:1.37.2.2	Thu Jan 13 21:58:23 2011
+++ packages/clutter/clutter.spec	Thu Feb  3 15:31:21 2011
@@ -2,30 +2,40 @@
 Summary:	Library for rich GUIs
 Summary(pl.UTF-8):	Biblioteka do bogatych graficznych interfejsów użytkownika
 Name:		clutter
-Version:	1.5.12
+Version:	1.6.0
 Release:	0.1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://www.clutter-project.org/sources/clutter/1.5/%{name}-%{version}.tar.bz2
-# Source0-md5:	8220b2ed95be9aeb4a8e566096449b15
+Source0:	http://www.clutter-project.org/sources/clutter/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	71cf28a989c24c3ff2c5f704b080ed3c
 Patch0:		gtkdoc.patch
+Patch1:		missing.patch
 URL:		http://www.clutter-project.org/
 BuildRequires:	OpenGL-GLX-devel
-BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.10
-BuildRequires:	cairo-devel >= 1.6
+BuildRequires:	atk-devel >= 1.7
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	cairo-devel
+BuildRequires:	cairo-gobject-devel >= 1.10
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	gdk-pixbuf2-devel
+BuildRequires:	gettext-devel >= 0.17
+BuildRequires:	glib2-devel >= 1:2.26.0
 BuildRequires:	gobject-introspection-devel >= 0.9.5
-BuildRequires:	gtk+2-devel >= 1:2.0
-BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	json-glib-devel >= 0.10.4-3
-BuildRequires:	libtool
+BuildRequires:	gtk-doc >= 1.13
+BuildRequires:	json-glib-devel >= 0.12
+BuildRequires:	libtool >= 2.2.6
+BuildRequires:	libxslt-progs
+BuildRequires:	pango-devel >= 1.20
 BuildRequires:	pango-devel >= 1:1.20
 BuildRequires:	pkgconfig
 BuildRequires:	python-modules
 BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXcomposite-devel >= 0.4
+BuildRequires:	xorg-lib-libXdamage-devel
+BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXfixes-devel >= 4
+BuildRequires:	xorg-lib-libXi-devel
 Obsoletes:	clutter-cairo < 1.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -98,6 +108,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -121,6 +132,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libclutter-glx-1.0.la
+
 %find_lang clutter-1.0
 
 %clean
@@ -139,7 +152,6 @@
 %files devel
 %defattr(644,root,root,755)
 %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}/cally-1.0.pc
@@ -166,6 +178,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37.2.3  2011/02/03 14:31:21  wiget
+- up to stable 1.6.0
+- added missing.patch (cb_button.h missed in tarball)
+- updated BRs (based on configure.ac)
+- drop libtool file
+
 Revision 1.37.2.2  2011/01/13 20:58:23  wiget
 - 1.5.12
 

================================================================
Index: packages/clutter/missing.patch
diff -u /dev/null packages/clutter/missing.patch:1.1.2.1
--- /dev/null	Thu Feb  3 15:31:26 2011
+++ packages/clutter/missing.patch	Thu Feb  3 15:31:21 2011
@@ -0,0 +1,87 @@
+--- clutter-1.6.0/doc/cookbook/examples/cb-button.h.wiget	2011-02-03 14:52:55.838124992 +0100
++++ clutter-1.6.0/doc/cookbook/examples/cb-button.h	2011-02-03 14:53:12.305129788 +0100
+@@ -0,0 +1,84 @@
++/* inclusion guard */
++#ifndef __CB_BUTTON_H__
++#define __CB_BUTTON_H__
++
++/* include any dependencies */
++#include <clutter/clutter.h>
++
++/* GObject implementation */
++
++/* declare this function signature to remove compilation errors with -Wall;
++ * the cb_button_get_type() function is actually added via the
++ * G_DEFINE_TYPE macro in the .c file
++ */
++GType cb_button_get_type (void);
++
++/* GObject type macros */
++/* returns the class type identifier (GType) for CbButton */
++#define CB_TYPE_BUTTON            (cb_button_get_type ())
++
++/* cast obj to a CbButton object structure*/
++#define CB_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CB_TYPE_BUTTON, CbButton))
++
++/* check whether obj is a CbButton */
++#define CB_IS_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CB_TYPE_BUTTON))
++
++/* cast klass to CbButtonClass class structure */
++#define CB_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CB_TYPE_BUTTON, CbButtonClass))
++
++/* check whether klass is a member of the CbButtonClass */
++#define CB_IS_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CB_TYPE_BUTTON))
++
++/* get the CbButtonClass structure for a CbButton obj */
++#define CB_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CB_TYPE_BUTTON, CbButtonClass))
++
++/*
++ * Private instance fields; see
++ * http://www.gotw.ca/gotw/024.htm for the rationale
++ */
++typedef struct _CbButtonPrivate CbButtonPrivate;
++typedef struct _CbButton        CbButton;
++typedef struct _CbButtonClass   CbButtonClass;
++
++/* object structure */
++struct _CbButton
++{
++  /*<private>*/
++  ClutterActor parent_instance;
++
++  /* structure containing private members */
++  /*<private>*/
++  CbButtonPrivate *priv;
++};
++
++/* class structure */
++struct _CbButtonClass
++{
++  /* signals */
++  void (* clicked)(CbButton *button);
++
++  /*<private>*/
++  ClutterActorClass parent_class;
++};
++
++/* public API */
++
++/* constructor - note this returns a ClutterActor instance */
++ClutterActor *cb_button_new (void);
++
++/* getter */
++G_CONST_RETURN gchar * cb_button_get_text (CbButton *self);
++
++/* setters - these are wrappers round functions
++ * which change properties of the internal actors
++ */
++void cb_button_set_text (CbButton    *self,
++                         const gchar *text);
++
++void cb_button_set_background_color (CbButton           *self,
++                                     const ClutterColor *color);
++
++void cb_button_set_text_color (CbButton           *self,
++                               const ClutterColor *color);
++
++#endif /* __CB_BUTTON_H__ */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/clutter/clutter.spec?r1=1.37.2.2&r2=1.37.2.3&f=u

