- up to 1.0.0 (merged from DEVEL)

Changed files:
    clutter-gtk-fix.patch -> 1.2
    clutter-gtk.spec -> 1.29
    gobject-introspection.patch -> 1.2

diff --git a/clutter-gtk-fix.patch b/clutter-gtk-fix.patch
deleted file mode 100644 (file)
index a8d6d3c..0000000
--- a/clutter-gtk-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur clutter-gtk-0.10.8.orig//clutter-gtk/Makefile.am clutter-gtk-0.10.8.fix//clutter-gtk/Makefile.am
---- clutter-gtk-0.10.8.orig//clutter-gtk/Makefile.am   2010-11-18 10:33:53.000000000 +0100
-+++ clutter-gtk-0.10.8.fix//clutter-gtk/Makefile.am    2010-11-18 10:35:02.501676737 +0100
-@@ -49,7 +49,7 @@
-               --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
-               --identifier-prefix=GtkClutter \
-               --symbol-prefix=gtk_clutter \
--              $(INCLUDES) $(AM_CPPFLAGS) \
-+              $(INCLUDES) $(AM_CPPFLAGS) $(GTK_CFLAGS) \
-               --add-include-path=$(srcdir) --add-include=path=. \
-               --include=Clutter-1.0 \
-               --include=GdkPixbuf-2.0 \

diff --git a/clutter-gtk.spec b/clutter-gtk.spec
index d7687f3310aa3179f23ddbf5e3015c510e105e63..9b24aad18944b9996741d4ca3e5c3826687a4e97 100644 (file)
--- a/clutter-gtk.spec
+++ b/clutter-gtk.spec
@@ -1,28 +1,26 @@
 Summary:       Library integrating clutter with GTK+
 Summary(pl.UTF-8):     Biblioteka integrująca clutter z GTK+
 Name:          clutter-gtk
-Version:       0.10.8
-Release:       2
+Version:       1.0.0
+Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://www.clutter-project.org/sources/clutter-gtk/0.10/%{name}-%{version}.tar.gz
-# Source0-md5: 2233c7f92535f5017accea04701131cd
-Patch0:                gobject-introspection.patch
-Patch1:                %{name}-fix.patch
+Source0:       http://www.clutter-project.org/sources/clutter-gtk/1.0/%{name}-%{version}.tar.gz
+# Source0-md5: 1cd5e5421a49ac03c176c6910523413c
 URL:           http://www.clutter-project.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
-BuildRequires: clutter-devel >= 1.2.0
+BuildRequires: clutter-devel >= 1.3.8
 BuildRequires: docbook-dtd412-xml
+BuildRequires: gettext >= 0.17
 BuildRequires: glibc-misc
-BuildRequires: gobject-introspection-devel >= 0.9.3
-BuildRequires: gtk+2-devel >= 2:2.19.5
+BuildRequires: gobject-introspection-devel >= 0.9.12
+BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.14
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: pkgconfig
 BuildRequires: python-modules
 Requires:      clutter >= 1.2.0
-Requires:      gtk+2 >= 2:2.19.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,7 +35,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki clutter-gtk
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      clutter-devel >= 1.2.0
-Requires:      gtk+2-devel >= 2:2.19.5
+Requires:      gtk+3-devel >= 3.0.0
 
 %description devel
 Header files for clutter-gtk library.
@@ -71,8 +69,6 @@ Dokumentacja API clutter-gtk.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -82,6 +78,7 @@ Dokumentacja API clutter-gtk.
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        --enable-gtk-doc \
        --enable-static \
        --with-html-dir=%{_gtkdocdir}
@@ -94,6 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -103,22 +102,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/libclutter-gtk-0.10.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclutter-gtk-0.10.so.0
-%{_libdir}/girepository-1.0/GtkClutter-0.10.typelib
+%attr(755,root,root) %{_libdir}/libclutter-gtk-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclutter-gtk-1.0.so.0
+%{_libdir}/girepository-1.0/GtkClutter-1.0.typelib
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclutter-gtk-0.10.so
-%{_libdir}/libclutter-gtk-0.10.la
-%{_includedir}/clutter-1.0/%{name}
-%{_pkgconfigdir}/clutter-gtk-0.10.pc
-%{_datadir}/gir-1.0/GtkClutter-0.10.gir
+%attr(755,root,root) %{_libdir}/libclutter-gtk-1.0.so
+%{_includedir}/clutter-gtk-1.0
+%{_pkgconfigdir}/clutter-gtk-1.0.pc
+%{_datadir}/gir-1.0/GtkClutter-1.0.gir
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libclutter-gtk-0.10.a
+%{_libdir}/libclutter-gtk-1.0.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/%{name}
+%{_gtkdocdir}/%{name}-1.0

diff --git a/gobject-introspection.patch b/gobject-introspection.patch
deleted file mode 100644 (file)
index 5e2eec0..0000000
--- a/gobject-introspection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- clutter-gtk-0.10.8/clutter-gtk/Makefile.am~        2010-09-16 15:44:00.000000000 +0200
-+++ clutter-gtk-0.10.8/clutter-gtk/Makefile.am 2010-09-25 15:59:10.178393824 +0200
-@@ -47,7 +47,8 @@
- GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
-       $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
-               --namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
--              --strip-prefix=GtkClutter \
-+              --identifier-prefix=GtkClutter \
-+              --symbol-prefix=gtk_clutter \
-               $(INCLUDES) $(AM_CPPFLAGS) \
-               --add-include-path=$(srcdir) --add-include=path=. \
-               --include=Clutter-1.0 \