[rawtherapee] Sync upstream

[Thibault North]

commit a6dc739e5a6792b54256262621c15d582c9ec94a
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Mon Jan 3 14:47:01 2011 -0500

    Sync upstream

 rawtherapee.spec |   10 +++++++---
 sources          |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/rawtherapee.spec b/rawtherapee.spec
index 08c7885..46ee4c9 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -13,7 +13,7 @@
 
 Name:           rawtherapee
 Version:        3.0
-Release:        0.26.%{prerelease}%{?dist}
+Release:        0.27.%{prerelease}%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -30,8 +30,6 @@ BuildRequires:  gtkmm24-devel >= 2.16
 BuildRequires:  lcms-devel  libjpeg-devel libtiff-devel
 BuildRequires:  libpng-devel libiptcdata-devel desktop-file-utils
 Requires:       hicolor-icon-theme
-# This package is rawtherapee with extra patches from the -staging repo
-Conflicts:      rawtherapee-staging
 
 
 %description
@@ -54,6 +52,9 @@ sed -i "s|^.*options.showInfo.*||" rtgui/editorpanel.cc
 # fix wrong line endings
 sed -i "s|\r||g" AUTHORS.txt COMPILE.txt
 
+# Do not move LICENSE.txt and AUTHORS.txt in bindir
+sed -i "s|install (FILES AUTHOR.*$||" CMakeLists.txt
+
 sed -i "s|CMAKE_CXX_FLAGS \${CMAKE_CXX_FLAGS} \${OpenMP_CXX_FLAGS}|CMAKE_CXX_FLAGS \"\${CMAKE_CXX_FLAGS} \${OpenMP_CXX_FLAGS}\"|" CMakeLists.txt
 
 # Do not install useless rtstart:
@@ -112,6 +113,9 @@ fi || :
 %{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
 
 %changelog
+* Mon Jan 3 2011 Thibault North <tnorth at fedoraproject.org> - 3.0-0.27.a1
+- Sync with upstream for various bugfixes and enhancements
+
 * Sun Dec 19 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.26.a1
 - Sync with branch_3.0 upstream: rawtherapee has a stable branch now.
 
diff --git a/sources b/sources
index 9ebc5dd..cf64c5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8aa6de81bd83eee3019decb7d203b296  rawtherapee-3.0-a1.tar.bz2
+9bb1d85c5db230af8a049be70482443c  rawtherapee-3.0-a1.tar.bz2