diff --git a/.cvsignore b/.cvsignore index 0d6ce55..1389244 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cheese-2.25.1.tar.bz2 +cheese-2.25.2.tar.bz2 diff --git a/cheese-2.24.1-resolution-range.patch b/cheese-2.24.1-resolution-range.patch deleted file mode 100644 index 7449f90..0000000 --- a/cheese-2.24.1-resolution-range.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up cheese-2.24.1/src/cheese-webcam.c~ cheese-2.24.1/src/cheese-webcam.c ---- cheese-2.24.1/src/cheese-webcam.c~ 2008-11-09 17:05:26.000000000 +0100 -+++ cheese-2.24.1/src/cheese-webcam.c 2008-11-09 17:05:26.000000000 +0100 -@@ -567,7 +567,9 @@ cheese_webcam_get_supported_video_format - - cur_width = min_width; - cur_height = min_height; -- while (cur_width < max_width && cur_height < max_height) -+ /* Gstreamer will sometimes give us a range with min_xxx == max_xxx, -+ we use <= here (and not below) to make this work */ -+ while (cur_width <= max_width && cur_height <= max_height) - { - CheeseVideoFormat video_format; - diff --git a/cheese.spec b/cheese.spec index ec02ecc..151823f 100644 --- a/cheese.spec +++ b/cheese.spec @@ -1,14 +1,12 @@ Name: cheese -Version: 2.25.1 -Release: 4%{?dist} +Version: 2.25.2 +Release: 1%{?dist} Summary: Application for taking pictures and movies from a webcam Group: Amusements/Graphics License: GPLv2+ URL: http://projects.gnome.org/cheese/ -Source0: http://download.gnome.org/sources/cheese/2.24/%{name}-%{version}.tar.bz2 -# Submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=560032 -Patch0: cheese-2.24.1-resolution-range.patch +Source0: http://download.gnome.org/sources/cheese/2.25/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.10.0 @@ -43,7 +41,6 @@ videos from a webcam. It can also apply fancy graphical effects. %prep %setup -q -%patch0 -p1 %build @@ -128,6 +125,9 @@ fi %{_datadir}/dbus-1/services/org.gnome.Cheese.service %changelog +* Wed Dec 3 2008 Matthias Clasen 2.25.2-1 +- Update to 2.25.2 + * Thu Nov 21 2008 Matthias Clasen 2.25.1-4 - Better URL diff --git a/sources b/sources index dc6836b..f5c5b6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93957c44d66f1799f3a77515698a3c49 cheese-2.25.1.tar.bz2 +1be94313bd255a397029001838ab4ef9 cheese-2.25.2.tar.bz2