[rawtherapee] New upstream release 4.0.5

[Thibault North]

commit 1384fce66a0f7b3c4eb3fa0ccd5c4396c03496bc
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Sun Nov 27 13:26:14 2011 -0500

    New upstream release 4.0.5

 .gitignore          |    1 +
 rawtherapee.desktop |   10 ----------
 rawtherapee.spec    |   23 ++++++++++-------------
 sources             |    2 +-
 4 files changed, 12 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 43ecfa0..6d4991d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ rawtherapee-3.0-a1.tar.bz2
 /rawtherapee-3.0-a1.tar.bz2
 
 /rawtherapee-3.0.0.tar.bz2
+/rawtherapee-4.0.5.tar.bz2
diff --git a/rawtherapee.spec b/rawtherapee.spec
index 865eb11..17977d3 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -1,23 +1,21 @@
 # Tarfile created from Mercurial repository
 # hg clone https://rawtherapee.googlecode.com/hg/ %{name}-%{version}
 # cd %{name}-%{version}
-# hg update branch_3.0
-# LAST_REVISION=`hg log -b branch_3.0 | head -1 | sed 's|\s||g'`
+# hg update 4.0.5
+# LAST_REVISION=`hg log -b default | 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_*
 # rm -rf tools/createicon.exe
-# rm -f lib/*.a
 # tar cjvf ~/%{name}-%{version}.tar.bz2 ../%{name}-%{version}
 
-%global rtlastrev changeset:1207:2cfb6a613777
-%global rtlasttag Latest-tag:3.0.0,CSet:1182:f375835d4ed1
+%global rtlastrev changeset:1638:66393e581aa3
+%global rtlasttag Latest-tag:4.0.5,CSet:1617:bc42bb00a448
 %global rtdist 0
 
 Name:           rawtherapee
-Version:        3.0.0
+Version:        4.0.5
 Release:        1%{?dist}
 Summary:        Raw image processing software
 
@@ -25,7 +23,6 @@ Group:          Applications/Multimedia
 License:        GPLv3 and MIT and IJG
 URL:            http://www.rawtherapee.com/
 Source0:        %{name}-%{version}.tar.bz2
-Source1:        %{name}.desktop
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,9 +46,6 @@ to some common image format.
 # 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
-
 # Do not install useless rtstart:
 sed -i "s|install (PROGRAMS rtstart|\#install (PROGRAMS rtstart|" CMakeLists.txt
 
@@ -79,13 +73,13 @@ 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/ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 
 # These file are taken from the root already
-rm $RPM_BUILD_ROOT/%{_datadir}/doc/*.txt
+rm $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}/*.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,6 +112,9 @@ fi || :
 %{_datadir}/icons/hicolor/*/apps/rawtherapee.png
 
 %changelog
+* Sun Nov 27 2011  Thibault North <tnorth at fedoraproject.org> - 4.0.5-1
+- Upgrade to release 4.0.5
+
 * Thu Aug 18 2011 Thibault North <tnorth at fedoraproject.org> - 3.0.0-1
 - Upgrade to stable release 3.0.0
 
diff --git a/sources b/sources
index 34aafec..4744a3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-77443d269acc80be46beb78ca6f020e5  rawtherapee-3.0.0.tar.bz2
+b967057ffc3978bddcb5924b21db7798  rawtherapee-4.0.5.tar.bz2