[rawtherapee] Update to 4.0.8
Thibault North
tnorth at fedoraproject.org
Sat Apr 7 19:44:15 UTC 2012
commit e4821b82a6d7311e6b9c204512c1894ad43a2194
Author: Thibault North <tnorth at packeron.ece.mcgill.ca>
Date: Sat Apr 7 15:43:34 2012 -0400
Update to 4.0.8
.gitignore | 1 +
rawtherapee.spec | 72 +++++++++++++++++++++++++----------------------------
sources | 2 +-
3 files changed, 36 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 517ec76..54f898f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ rawtherapee-3.0-a1.tar.bz2
/rawtherapee-3.0.0.tar.bz2
/rawtherapee-4.0.5.tar.bz2
/rawtherapee-4.0.7.tar.bz2
+/rawtherapee-4.0.8.tar.xz
diff --git a/rawtherapee.spec b/rawtherapee.spec
index dfdde1f..e017df6 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -1,30 +1,21 @@
-# Tarfile created from Mercurial repository
-# hg clone https://rawtherapee.googlecode.com/hg/ %{name}-%{version}
-# cd %{name}-%{version}
-# 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 tools/createicon.exe
-# tar cjvf ~/%{name}-%{version}.tar.bz2 ../%{name}-%{version}
-
-%global rtlastrev changeset:1768:c0f0396030bf
-%global rtlasttag changeset:1768:c0f0396030bf
-%global rtdist 0
+# Remove old docs and binary file without source and licence createicon.exe
+# wget https://rawtherapee.googlecode.com/files/%{name}-source-%{version}.tar.xz
+# tar xf %{name}-source-%{version}.tar.xz && cd %{name}-%{version}
+# rm tools/createicon.exe
+# rm -rf doc/source
+# find doc/ -name "*.pdf" | grep -v "4\.0" \ xargs rm
+# cd -
+# tar -c --xz -f %{name}-%{version}.tar.xz %{name}-%{version}/
Name: rawtherapee
-Version: 4.0.7
-Release: 3%{?dist}
+Version: 4.0.8
+Release: 1%{?dist}
Summary: Raw image processing software
Group: Applications/Multimedia
License: GPLv3 and MIT and IJG
URL: http://www.rawtherapee.com/
-Source0: %{name}-%{version}.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: %{name}-%{version}.tar.xz
BuildRequires: cmake >= 2.6
BuildRequires: gtk2-devel >= 2.12
@@ -39,32 +30,34 @@ Rawtherapee is a RAW image processing software. It gives full control over
many parameters to enhance the raw picture before finally exporting it
to some common image format.
+%package doc
+Group: Applications/Multimedia
+Summary: Documentation for RawTherapee
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+The %{name}-doc package contains the documentation for Rawtherapee
%prep
%setup -q
# fix wrong line endings
-sed -i "s|\r||g" AUTHORS.txt COMPILE.txt
-
-# Fix faulty MIME directive
-sed -i "s|rawtherapee\.png|rawtherapee|" rtdata/icons/rawtherapee.desktop.in
-
-# Do not install useless rtstart:
-sed -i "s|install (PROGRAMS rtstart|\#install (PROGRAMS rtstart|" CMakeLists.txt
+sed -i "s|\r||g" AUTHORS.txt COMPILE.txt LICENSE.txt
-# Tell version
+# Remove mercurial dependency and specify version
cat > rtgui/version.h << EOF
#ifndef _VERSION_
#define _VERSION_
-#define VERSION "%{rtlastrev} %{rtlasttag}"
-#define TAGDISTANCE %{rtdist}
+#define VERSION "%{version}"
+#define TAGDISTANCE 0
#define CACHEFOLDERNAME "RawTherapee${CACHE_NAME_SUFFIX}"
#endif
EOF
cat > AboutThisBuild.txt << EOF
-See package informations
+See package information
EOF
%build
@@ -82,10 +75,7 @@ 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/%{name}/*.txt
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
%post
touch --no-create %{_datadir}/icons/hicolor
@@ -104,8 +94,8 @@ fi || :
/sbin/ldconfig
+
%files
-%defattr(-,root,root,-)
%doc AUTHORS.txt LICENSE.txt COMPILE.txt
%{_bindir}/rawtherapee
%{_libdir}/*.so
@@ -113,9 +103,15 @@ fi || :
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/rawtherapee.png
+%files doc
+%doc doc/built/pdf/*/*%{version}.pdf
+
+
%changelog
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.7-3
-- Rebuilt for c++ ABI breakage
+* Sat Apr 7 2012 Thibault North <tnorth at fedoraproject.org> - 4.0.8-1
+- Update to 4.0.8
+- Spec cleanup
+- Rebase on the online source archive
* Sun Feb 12 2012 Thibault North <tnorth at fedoraproject.org> - 4.0.7-2
- Fix faulty MIME directive
diff --git a/sources b/sources
index 8a8361b..8208437 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67f696f8bd88a3843ae0833e9d451c5a rawtherapee-4.0.7.tar.bz2
+d2f829e76a74aa8d3e0ee6a9e26820c4 rawtherapee-4.0.8.tar.xz
More information about the scm-commits
mailing list