From cd0c913db833ba9390a32cfcb0e037fe1bdacf27 Mon Sep 17 00:00:00 2001
From: Thibault North <tnorth@fedoraproject.org>
Date: Apr 27 2010 13:51:26 +0000
Subject: Switch back to official release (no more fork), fixes, features.


---

diff --git a/.cvsignore b/.cvsignore
index 8570a1e..649d1de 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rawtherapee-3.0-a1-fork.tar.bz2
+rawtherapee-3.0-a1.tar.bz2
diff --git a/import.log b/import.log
index e8ea009..2a34eb1 100644
--- a/import.log
+++ b/import.log
@@ -4,3 +4,4 @@ rawtherapee-3_0-0_15_a1_fc12:F-13:rawtherapee-3.0-0.15.a1.fc12.src.rpm:127073268
 rawtherapee-3_0-0_16_a1_fc12:F-13:rawtherapee-3.0-0.16.a1.fc12.src.rpm:1271083359
 rawtherapee-3_0-0_17_a1_fc12:F-13:rawtherapee-3.0-0.17.a1.fc12.src.rpm:1271440091
 rawtherapee-3_0-0_18_a1_fc12:F-13:rawtherapee-3.0-0.18.a1.fc12.src.rpm:1271453608
+rawtherapee-3_0-0_20_a1_fc12:F-13:rawtherapee-3.0-0.20.a1.fc12.src.rpm:1272376220
diff --git a/rawtherapee.spec b/rawtherapee.spec
index 199b19a..cf5da47 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -1,20 +1,18 @@
-# Tarfile created using git
-# git clone git://github.com/thebiguno/RawTherapee-Fork.git %{name}-%{version}
-# 
+# Tarfile created from Mercurial repository
+# hg clone -u tip https://rawtherapee.googlecode.com/hg/ %{name}-%{version}
 # cd %{name}-%{version}
-# rm -rf .git*
+# rm -rf .hg*
 # rm -rf doc/
 # rm -rf rawzor_*
-# rm -rf rtdata/themes/* tools/createicon.exe
-# mv "rtdata/languages/English (US)" . && rm -f rtdata/languages/* && mv "English (US)" rtdata/languages/
+# rm -rf tools/createicon.exe
 # rm -f lib/*.a
-# tar -cjvf ~/%{name}-%{version}-%{prerelease}-fork.tar.bz2 ../%{name}-%{version}
+# tar -cjvf ~/%{name}-%{version}-%{prerelease}.tar.bz2 ../%{name}-%{version}
 %global prerelease a1
-%global tarfile %{name}-%{version}-%{prerelease}-fork.tar.bz2
+%global tarfile %{name}-%{version}-%{prerelease}.tar.bz2
 
 Name:           rawtherapee
 Version:        3.0
-Release:        0.18.%{prerelease}%{?dist}
+Release:        0.20.%{prerelease}%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -42,26 +40,17 @@ to some common image format.
 %prep
 %setup -q
 
-# we don't want rawzor support
-sed -i 's#\"Build with Rawzor support\" ON#\"Build with Rawzor support\" OFF#' CMakeLists.txt
+# Fix for x86_64 and ppc64
+%ifarch x86_64 ppc64
+sed -i "s|/lib|/lib64|g" CMakeLists.txt
+%endif
 
-# Remove unlicenced themes (keep default) and languages (keep english)
-sed -ri "s/^\s+.languages\/.*$//g" rtdata/CMakeLists.txt
-sed -ri "s/LANGUAGEFILES /LANGUAGEFILES \"languages\/English (US)\"\)/" rtdata/CMakeLists.txt
-sed -ri "s/^\s+themes\/.*//g" rtdata/CMakeLists.txt
-sed -ri "s/(set \(THEMEFILES.+?)//" rtdata/CMakeLists.txt
-# Allow compiling without theme
-sed -ri "s/(install.+?themes\))//" rtdata/CMakeLists.txt
-
-# Compile rtexif as static
-sed -ri "s/add_library \(rtexif/add_library \(rtexif STATIC/" rtexif/CMakeLists.txt
+# Hide info box on picture by default
+sed -i "s|^.*options.showInfo.*||" rtgui/editorpanel.cc
 
 # fix wrong line endings
 sed -i "s|\r||g" AUTHORS.txt COMPILE.txt
 
-# settle more permissions
-chmod a-x {AUTHORS.txt,COMPILE.txt,LICENSE.txt}
-
 
 %build
 %{cmake} %{?BUILD_TESTS} .
@@ -94,6 +83,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi 
 %{_bindir}/update-desktop-database %{_datadir}/applications || :
 
+/sbin/ldconfig
+
 %postun
 %{_bindir}/update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
@@ -101,16 +92,28 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi || :
 
+/sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS.txt LICENSE.txt COMPILE.txt
 %{_bindir}/rt
+%{_libdir}/*.so
 %{_datadir}/%{name}/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/rawtherapee.png
 %{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
 
 %changelog
+* Tue Apr 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.20.a1
+- Fix compilation for 64 bits OSes
+
+* Tue Apr 27 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.19.a1
+- Switch back to Rawtherapee original release
+- Bug fixes
+- Translations and themes now have a licence and can be used
+- Hide information on pictures by default
+
 * Fri Apr 16 2010 Thibault North <tnorth@fedoraproject.org> - 3.0-0.18.a1
 - New release including curves (exposure and luminance)
 
diff --git a/sources b/sources
index edcd4c1..34bbc7f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b1594521bb94fad552d1ec2fd3301b0  rawtherapee-3.0-a1-fork.tar.bz2
+3248d52ffdee8ad67114864bcbc965f5  rawtherapee-3.0-a1.tar.bz2