rpms/nbtk/devel nbtk-clutter1.patch,NONE,1.1 nbtk.spec,1.14,1.15

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/nbtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14604

Modified Files:
	nbtk.spec 
Added Files:
	nbtk-clutter1.patch 
Log Message:
- Add patch for clutter 1.0

nbtk-clutter1.patch:
 configure.ac |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE nbtk-clutter1.patch ---
>From 0fbc8b15a57a3deef74c8c85f6418fd7d390de24 Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood at intel.com>
Date: Wed, 29 Jul 2009 10:18:49 +0000
Subject: Bump clutter requirement to 1.0

---
diff --git a/configure.ac b/configure.ac
index 512b266..12259b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
 
 AM_PROG_LIBTOOL
 
-NBTK_REQUIRES="clutter-0.9 >= 0.9.6 clutter-imcontext-0.1 libccss-1 = 0.3.1"
+NBTK_REQUIRES="clutter-1.0 clutter-imcontext-0.1 libccss-1 = 0.3.1"
 PKG_CHECK_MODULES(NBTK, [$NBTK_REQUIRES])
 PKG_CHECK_MODULES(GTK, [gtk+-2.0])
 
--
cgit v0.8.2


Index: nbtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nbtk/devel/nbtk.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- nbtk.spec	27 Jul 2009 01:02:59 -0000	1.14
+++ nbtk.spec	30 Jul 2009 10:59:02 -0000	1.15
@@ -1,15 +1,16 @@
 Name:           nbtk
 Version:        0.16.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A toolkit for moblin NetBooks
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://moblin.org/projects/netbook-toolkit-nbtk
 Source0:        http://git.moblin.org/cgit.cgi/%{name}/snapshot/%{name}-%{version}.tar.bz2
+Patch0:		nbtk-clutter1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: clutter-devel >= 0.9.4
+BuildRequires: clutter-devel >= 1.0.0
 BuildRequires: clutter-imcontext-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
@@ -43,9 +44,13 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .clutter1
 
-%build
+# run autogen.sh until we have a proper release, but don't run configure twice.
+sed -i '/configure/d' autogen.sh
 ./autogen.sh
+
+%build
 %configure --enable-gtk-doc --disable-static
 make %{?_smp_mflags}
 
@@ -54,7 +59,7 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 #Remove libtool archives.
-rm -rf %{buildroot}/%{_libdir}/*.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %clean
 rm -rf %{buildroot}
@@ -78,7 +83,10 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/nbtk
 
 %changelog
-* Mon Jul 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-4
+* Thu Jul 30 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-6
+- Add patch for clutter 1.0
+
+* Mon Jul 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-5
 - Add new files
 
 * Mon Jul 27 2009 Peter Robinson <pbrobinson at gmail.com> 0.16.3-4