From 7e5bc361103a9ec3bfe1d5698ca96102fcaf1f7c Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Kie=C5=9B?= <kiesiu@pld-linux.org>
Date: Tue, 27 Mar 2012 22:17:43 +0000
Subject: [PATCH] - updated to 3.4.0; merged from DEVEL

Changed files:
    cheese.spec -> 1.50
---
 cheese.spec | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/cheese.spec b/cheese.spec
index 442d2c2..3b36884 100644
--- a/cheese.spec
+++ b/cheese.spec
@@ -1,15 +1,16 @@
 Summary:	A cheesy program to take pictures and videos from your web cam
 Summary(pl.UTF-8):	Program do pobierania zdjęć i filmów z kamery internetowej
 Name:		cheese
-Version:	3.2.2
-Release:	2
+Version:	3.4.0
+Release:	1
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/cheese/3.2/%{name}-%{version}.tar.xz
-# Source0-md5:	a674bbe235cc960e578bb71b6aa55783
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/cheese/3.4/%{name}-%{version}.tar.xz
+# Source0-md5:	2cee1916ad1e7271f72c3558cf1284ed
 URL:		http://projects.gnome.org/cheese/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.11
+BuildRequires:	cairo-devel >= 1.10.0
 BuildRequires:	clutter-devel >= 1.6.1
 BuildRequires:	clutter-gst-devel >= 1.0.0
 BuildRequires:	clutter-gtk-devel >= 0.91.8
@@ -27,19 +28,22 @@ BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	gtk-doc >= 1.14
 BuildRequires:	gtk-doc-automake >= 1.14
 BuildRequires:	intltool >= 0.40.0
+BuildRequires:	itstool
 BuildRequires:	libcanberra-gtk3-devel >= 0.26
 BuildRequires:	libgee-devel >= 0.6.0
 BuildRequires:	librsvg-devel >= 2.32.0
 BuildRequires:	libtool >= 2:2.2
 BuildRequires:	mx-devel
-BuildRequires:	pkgconfig
+BuildRequires:	pango-devel >= 1.28.0
+BuildRequires:	pkgconfig >= 0.24
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.601
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-glib-devel
-BuildRequires:	vala >= 0.13.2
+BuildRequires:	vala >= 2:0.14.0
 BuildRequires:	xorg-lib-libXxf86vm-devel
 BuildRequires:	xz
+BuildRequires:	yelp-tools
 Requires(post,postun):	glib2 >= 1:2.26.0
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	scrollkeeper
@@ -50,6 +54,7 @@ Requires:	gstreamer-plugins-good
 Requires:	gstreamer-theora >= 0.10.32
 Requires:	gstreamer-vorbis >= 0.10.32
 Requires:	hicolor-icon-theme
+Suggests:	nautilus-sendto >= 3.0.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -106,13 +111,12 @@ Dokumentacja API Cheese.
 %build
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
 	--disable-schemas-compile \
-	--disable-scrollkeeper \
 	--disable-silent-rules \
 	--disable-static \
 	--enable-gtk-doc \
@@ -152,14 +156,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/cheese.desktop
 %{_datadir}/cheese
 %{_datadir}/glib-2.0/schemas/org.gnome.Cheese.gschema.xml
-%{_iconsdir}/hicolor/*/apps/*
+%{_iconsdir}/hicolor/*/*/*.png
+%{_iconsdir}/hicolor/*/*/*.svg
+%{_mandir}/man1/cheese.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcheese-gtk.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcheese-gtk.so.20
+%attr(755,root,root) %ghost %{_libdir}/libcheese-gtk.so.21
 %attr(755,root,root) %{_libdir}/libcheese.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcheese.so.1
+%attr(755,root,root) %ghost %{_libdir}/libcheese.so.3
 %{_libdir}/girepository-1.0/Cheese-3.0.typelib
 
 %files devel
-- 
2.43.0