[rawstudio] Rebase to newer snapshot

[Gianluca Sforna]

commit 4011768a298afd724bac714f0c3aabe80a57a477
Author: Gianluca Sforna <giallu at gmail.com>
Date:   Tue Feb 22 07:13:59 2011 +0100

    Rebase to newer snapshot

 rawstudio-1.2-link_libX11.patch |   13 -------------
 rawstudio-1.2-no_werror.patch   |   10 ++++++++++
 rawstudio.spec                  |   16 ++++++++++------
 sources                         |    2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/rawstudio-1.2-no_werror.patch b/rawstudio-1.2-no_werror.patch
new file mode 100644
index 0000000..1b985d5
--- /dev/null
+++ b/rawstudio-1.2-no_werror.patch
@@ -0,0 +1,10 @@
+diff --git a/librawstudio/Makefile.am b/librawstudio/Makefile.am
+index ffec8b5..a0f95f0 100644
+--- a/librawstudio/Makefile.am
++++ b/librawstudio/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CFLAGS = -Wall -Werror -fno-strict-aliasing
++AM_CFLAGS = -Wall -fno-strict-aliasing
+ 
+ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
diff --git a/rawstudio.spec b/rawstudio.spec
index b787363..79aa7d9 100644
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -1,6 +1,6 @@
 Name:           rawstudio 
 Version:        1.2
-Release:        8%{?dist}.20100907svn3521
+Release:        9%{?dist}.20110221svn3825
 Summary:        Read, manipulate and convert digital camera raw images
 
 Group:          Applications/Multimedia 
@@ -17,14 +17,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel, libxml2-devel, GConf2-devel, dbus-devel
 BuildRequires:  lcms-devel, libjpeg-devel, libtiff-devel, exiv2-devel
 BuildRequires:  flickcurl-devel, lensfun-devel, fftw-devel, libcurl-devel
-BuildRequires:  sqlite-devel, openssl-devel
+BuildRequires:  sqlite-devel, openssl-devel, gphoto2-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
 BuildRequires:  libtool
 
-# http://bugzilla.rawstudio.org/show_bug.cgi?id=417
-Patch0:         rawstudio-1.2-link_libX11.patch
-
+# Some new warnings on gcc 4.6 break the build. Disable -Werror for now
+Patch0:         rawstudio-1.2-no_werror.patch
 
 %description
 Rawstudio is a highly specialized application for processing RAW images
@@ -41,7 +40,7 @@ JPEG, PNG or TIF format images from most digital cameras.
 
 %prep
 %setup -q -n rawstudio
-%patch0 -p0
+%patch0 -p1
 
 %build
 ./autogen.sh
@@ -98,6 +97,11 @@ update-desktop-database &> /dev/null ||:
 %{_libdir}/pkgconfig/rawstudio-1.1.pc
 
 %changelog
+* Mon Feb 21 2011 Gianluca Sforna <giallu at gmail.com> - 1.2-9
+- update to newer snapshot, includes fixes for #635964 and #636919
+- remove upstreamed patch, add new one to remove -Werror
+- require gphoto2
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-8.20100907svn3521
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 3ca4e17..9ff7282 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5676011863b3e1b01b5839004f7a49e3  rawstudio.tar.gz
+856c4ee93737f640e8ee98aa08cbd72d  rawstudio.tar.gz