[rawtherapee/f15] Sync with upstream

[Thibault North]

commit ed61d970ea995828d0dac93b2de80748dcb2d70d
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Mon Jun 6 20:56:05 2011 -0400

    Sync with upstream

 rawtherapee.spec |   32 +++++++++++++++++++++++++++++---
 sources          |    2 +-
 2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/rawtherapee.spec b/rawtherapee.spec
index a02f806..d1cc4ec 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -2,6 +2,9 @@
 # hg clone https://rawtherapee.googlecode.com/hg/ %{name}-%{version}
 # cd %{name}-%{version}
 # hg update branch_3.0
+# LAST_REVISION=`hg log | head -1` | sed 's|\s||g'
+# RT_CHANGESET=`hg parents --template 'Latest-tag:{latesttag},CSet:{rev}:{node|short}'`
+# RT_DIST=`hg parents --template '{latesttagdistance}'
 # rm -rf .hg*
 # rm -rf doc/
 # rm -rf rawzor_*
@@ -10,10 +13,13 @@
 # tar -cjvf ~/%{name}-%{version}-%{prerelease}.tar.bz2 ../%{name}-%{version}
 %global prerelease a1
 %global tarfile %{name}-%{version}-%{prerelease}.tar.bz2
+%global rtlastrev changeset:1280:a3575421be85
+%global rtlasttag Latesttag:3.0B1,CSet1101:65489f6f71c
+%global rtdist 37
 
 Name:           rawtherapee
 Version:        3.0
-Release:        0.28.%{prerelease}%{?dist}
+Release:        0.29.%{prerelease}%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -50,6 +56,21 @@ sed -i "s|install (FILES AUTHOR.*$||" CMakeLists.txt
 # Do not install useless rtstart:
 sed -i "s|install (PROGRAMS rtstart|\#install (PROGRAMS rtstart|" CMakeLists.txt
 
+# Tell version
+cat > rtgui/version.h << EOF
+#ifndef _VERSION_
+#define _VERSION_
+
+#define VERSION "%{rtlastrev} %{rtlasttag}"
+#define TAGDISTANCE %{rtdist}
+#define CACHEFOLDERNAME "RawTherapee${CACHE_NAME_SUFFIX}"
+#endif
+EOF
+
+cat > AboutThisBuild.txt << EOF
+See package informations
+EOF
+
 %build
 %{cmake} %{?BUILD_TESTS} -DLIBDIR=%{_libdir} -DCMAKE_BUILD_TYPE=None -DAUTOMATED_BUILD_SYSTEM:BOOL=ON .
 make VERBOSE=1 %{?_smp_mflags} 
@@ -59,8 +80,7 @@ make VERBOSE=1 %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT 
 
-desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
-    %{SOURCE1}
+desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{SOURCE1}
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
@@ -70,6 +90,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 cp -p rtdata/images/logoicon16.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/rawtherapee.png
 cp -p rtdata/images/logoicon32.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
 
+# These file are taken from the root already
+rm $RPM_BUILD_ROOT/%{_datadir}/doc/*.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,6 +125,10 @@ fi || :
 %{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
 
 %changelog
+* Mon Jun 6 2011  Thibault North <tnorth at fedoraproject.org> - 3.0-0.29.a1
+- Sync with upstream
+- Versioning now needs to be included in version.h 
+
 * Sun Mar 20 2011 Thibault North <tnorth at fedoraproject.org> - 3.0-0.28.a1
 - Updated to 3.0A2, distance 13 for many fixes
 - Updated spec file thanks to upstream fixes
diff --git a/sources b/sources
index cf64c5b..153942a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9bb1d85c5db230af8a049be70482443c  rawtherapee-3.0-a1.tar.bz2
+bf019403104f128548479119a1b6928d  rawtherapee-3.0-a1.tar.bz2