From a812f9672b4e5da75b95846121634394e1f9fd48 Mon Sep 17 00:00:00 2001
From: Thibault North <tnorth@fedoraproject.org>
Date: Sep 09 2010 20:20:05 +0000
Subject: Updated to a newer build of rawtherapee


---

diff --git a/.gitignore b/.gitignore
index 649d1de..9f1bafc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 rawtherapee-3.0-a1.tar.bz2
+/rawtherapee-3.0-a1.tar.bz2
diff --git a/rawtherapee.spec b/rawtherapee.spec
index b681a33..85ef3af 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -12,7 +12,7 @@
 
 Name:           rawtherapee
 Version:        3.0
-Release:        0.21.%{prerelease}%{?dist}
+Release:        0.23.%{prerelease}%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -29,6 +29,8 @@ 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
@@ -51,6 +53,10 @@ sed -i "s|^.*options.showInfo.*||" rtgui/editorpanel.cc
 # fix wrong line endings
 sed -i "s|\r||g" AUTHORS.txt COMPILE.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:
+sed -i "s|install (PROGRAMS rtstart|\#install (PROGRAMS rtstart|" CMakeLists.txt
 
 %build
 %{cmake} %{?BUILD_TESTS} .
@@ -99,12 +105,19 @@ fi || :
 %doc AUTHORS.txt LICENSE.txt COMPILE.txt
 %{_bindir}/rt
 %{_libdir}/*.so
-%{_datadir}/%{name}/*
+%{_datadir}/rawtherapee/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/rawtherapee.png
 %{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
 
 %changelog
+* Thu Sep 9 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.23.a1
+- Sync with upstream back to the official repository
+- Various fixes and enhancements
+
+* Thu May 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.22.a1
+- Sync upstream for OpenMP support
+
 * Mon May 11 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.21.a1
 - Sync with upstream rev ccc12f4a03
 - Segfault fix
diff --git a/sources b/sources
index cbfdd69..afeecd5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c2305066971ae9581d7b7780414ba5c  rawtherapee-3.0-a1.tar.bz2
+ac35fde1bdc713668e73ba3c2b22b185  rawtherapee-3.0-a1.tar.bz2