rpms/rawtherapee/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rawtherapee.desktop, 1.2, 1.3 rawtherapee.spec, 1.2, 1.3 sources, 1.2, 1.3 rawtherapee-lcms.patch, 1.1, NONE rawtherapee-rawzor.patch, 1.1, NONE

Wed Mar 24 05:30:35 UTC 2010

Author: tnorth

Update of /cvs/pkgs/rpms/rawtherapee/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16888/devel

Modified Files:
	.cvsignore import.log rawtherapee.desktop rawtherapee.spec 
	sources 
Removed Files:
	rawtherapee-lcms.patch rawtherapee-rawzor.patch 
Log Message:
New release relying on RawTherapee-Fork, much cleaner.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	20 Mar 2010 12:37:32 -0000	1.2
+++ .cvsignore	24 Mar 2010 05:30:34 -0000	1.3
@@ -1 +1 @@
-rawtherapee-3.0-a1.tar.bz2
+rawtherapee-3.0-a1-fork.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	20 Mar 2010 12:37:33 -0000	1.1
+++ import.log	24 Mar 2010 05:30:34 -0000	1.2
@@ -1 +1,2 @@
 rawtherapee-3_0-0_10_a1_fc12:HEAD:rawtherapee-3.0-0.10.a1.fc12.src.rpm:1269088598
+rawtherapee-3_0-0_14_a1_fc12:HEAD:rawtherapee-3.0-0.14.a1.fc12.src.rpm:1269408495


Index: rawtherapee.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/rawtherapee.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rawtherapee.desktop	20 Mar 2010 14:18:11 -0000	1.2
+++ rawtherapee.desktop	24 Mar 2010 05:30:35 -0000	1.3
@@ -4,7 +4,7 @@ Categories=Graphics;Photography;GTK;
 Name=Rawtherapee
 GenericName=Raw image converter
 Comment=Read, modify and export digital-camera raw files
-Exec=rtstart %F
+Exec=rt %F
 StartupNotify=true
 Icon=rawtherapee
 MimeType=image/x-dcraw;


Index: rawtherapee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/rawtherapee.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rawtherapee.spec	20 Mar 2010 14:18:11 -0000	1.2
+++ rawtherapee.spec	24 Mar 2010 05:30:35 -0000	1.3
@@ -1,19 +1,20 @@
-# Tarfile created using svn
-# svn checkout http://rawtherapee.googlecode.com/svn/tags/release-%{version}-%{prerelease}/ %{name}
-# cd %{name}
-# svn export . %{name}-%{version}
+# Tarfile created using git
+# git clone git://github.com/thebiguno/RawTherapee-Fork.git %{name}-%{version}
+# 
 # cd %{name}-%{version}
+# rm -rf .git*
+# rm -rf doc/
 # rm -rf rawzor_*
-# rm -f release/themes/* tools/createicon.exe
+# rm -f rtdata/themes/* tools/createicon.exe
+# mv rtdata/languages/english-us . && rm -f rtdata/languages/* && mv english-us rtdata/languages/
 # rm -f lib/*.a
-# mv release/languages/english-us release/ && rm -f release/languages/* && mv release/english-us release/languages/
-# tar -cjvf ~/%{name}-%{version}-%{prerelease}.tar.bz2 ../%{name}-%{version}
+# tar -cjvf ~/%{name}-%{version}-%{prerelease}-fork.tar.bz2 ../%{name}-%{version}
 %global prerelease a1
-%global tarfile %{name}-%{version}-%{prerelease}.tar.bz2
+%global tarfile %{name}-%{version}-%{prerelease}-fork.tar.bz2
 
 Name:           rawtherapee
 Version:        3.0
-Release:        0.11.%{prerelease}%{?dist}
+Release:        0.14.%{prerelease}%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -21,11 +22,6 @@ License:        GPLv3 and MIT and IJG
 URL:            http://www.rawtherapee.com/
 Source0:        %{tarfile}
 Source1:        %{name}.desktop
-# Check for lcms and various fixes to the makefile
-# Source: http://rawtherapee.com/forum/viewtopic.php?t=1701
-Patch0:         rawtherapee-lcms.patch
-# Removal of Rawzor dependency for the build, since rawzor is proprietary
-Patch1:         rawtherapee-rawzor.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,7 +30,6 @@ BuildRequires:  gtk2-devel >= 2.12
 BuildRequires:  gtkmm24-devel >= 2.16
 BuildRequires:  lcms-devel  libjpeg-devel libtiff-devel
 BuildRequires:  libpng-devel libiptcdata-devel desktop-file-utils
-#Requires:       argyllcms, lcms
 Requires:       hicolor-icon-theme
 
 
@@ -46,38 +41,17 @@ to some common image format.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-
-# adjust header locations
-sed -i "s|#include <gtkmm.h>|#include <gtkmm.h>\\n#include <stdio.h>|" rtgui/main.cc
-sed -i "s#argv0_ = argv\[0\];#argv0_ = getenv(\"RT_DATA\");#" rtgui/main.cc
 
 # we don't want rawzor support
 sed -i 's#\"Build with Rawzor support\" ON#\"Build with Rawzor support\" OFF#' CMakeLists.txt
 
-sed -i 's#-O3#${CMAKE_CXX_FLAGS}#g' rtexif/CMakeLists.txt
-sed -i 's#-O3#${CMAKE_CXX_FLAGS}#' rtgui/CMakeLists.txt
-sed -i 's#-O3#${CMAKE_CXX_FLAGS}#' rtengine/CMakeLists.txt
-
-# Avoid unexisting optimizations for these arch
-%ifarch ppc ppc64
-sed -i 's#-msse##' rtengine/CMakeLists.txt
-%endif
-
-# create shared lib for rtexif
-sed -i "s#add_library (rtexif#add_library (rtexif SHARED#" rtexif/CMakeLists.txt
-sed -i "s#export LD_LIBRARY_PATH=\`dirname \"\$0\"\`#export LD_LIBRARY_PATH=%{_libdir}/%{name}\\nexport RT_DATA=%{_datadir}/%{name}/#" rtstart
-sed -i "s#\`dirname \"\$0\"\`/rt#\`dirname \"\$0\"\`/rt#" rtstart
-
-# set fitting permissions
-find release/languages/ -type f -perm -u=x -exec chmod 0644 {} ';'
-find release/themes/ -type f -perm -u=x -exec chmod 0644 {} ';'
-find release/profiles/ -type f -perm -u=x -exec chmod 0644 {} ';'
-find release/images/ -type f -perm -u=x -exec chmod 0644 {} ';'
-find . -name *.cc -type f -perm -u=x -exec chmod 0644 {} ';'
-find . -name *.c -type f -perm -u=x -exec chmod 0644 {} ';'
-find . -name *.h -type f -perm -u=x -exec chmod 0644 {} ';'
+# Remove unlicenced themes (keep default) and languages (keep english)
+sed -ri "s/^\s+.languages\/.*$//g" rtdata/CMakeLists.txt
+sed -ri "s/\/catala/\/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
 
 # fix wrong line endings
 sed -i "s|\r||g" authors compile
@@ -93,7 +67,7 @@ make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install
+make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
     %{SOURCE1}
@@ -102,26 +76,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ico
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
 
 
-# create target directories
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}
-
-# lets install these into the right place
-install -pm 0755 release/rt $RPM_BUILD_ROOT/%{_bindir}/rt
-install -pm 0755 release/rtstart $RPM_BUILD_ROOT/%{_bindir}/rtstart
-cp -p release/options $RPM_BUILD_ROOT/%{_datadir}/%{name}
-install -pm 0755 release/librtengine.so $RPM_BUILD_ROOT/%{_libdir}/%{name}
-install -pm 0755 rtexif/librtexif.so $RPM_BUILD_ROOT/%{_libdir}/%{name}
 # icons
-cp -p release/images/logoicon16.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/rawtherapee.png
-cp -p release/images/logoicon32.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
-
-# and add the shared files
-cp -pr release/images $RPM_BUILD_ROOT/%{_datadir}/%{name}/
-cp -pr release/languages $RPM_BUILD_ROOT/%{_datadir}/%{name}/
-cp -pr release/profiles $RPM_BUILD_ROOT/%{_datadir}/%{name}/
-cp -pr release/themes $RPM_BUILD_ROOT/%{_datadir}/%{name}/
+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
 
 
 %clean
@@ -133,7 +90,6 @@ if [ -x %{_bindir}/gtk-update-icon-cache
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi 
 %{_bindir}/update-desktop-database %{_datadir}/applications || :
-/sbin/ldconfig
 
 %postun
 %{_bindir}/update-desktop-database %{_datadir}/applications
@@ -141,21 +97,27 @@ touch --no-create %{_datadir}/icons/hico
 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 copying compile
 %{_bindir}/rt
-%{_bindir}/rtstart
-%{_libdir}/%{name}/librtengine.so
-%{_libdir}/%{name}/librtexif.so
 %{_datadir}/%{name}/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/rawtherapee.png
 %{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
 
 %changelog
+* Tue Mar 23 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.14.a1
+- Remove sed liners which have been pushed upstream
+
+* Tue Mar 23 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.13.a1
+- Fix CMakeLists to build without extra languages and themes
+- Remove PDF docs : development-related or outdated
+
+* Tue Mar 23 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.12.a1
+- Now rely on RawTherapee-Fork, new upstream
+
 * Sat Mar 20 2010 Sebastian Dziallas <sebastian at when.com> - 3.0-0.11.a1
 - Correct path in .desktop file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	20 Mar 2010 12:37:33 -0000	1.2
+++ sources	24 Mar 2010 05:30:35 -0000	1.3
@@ -1 +1 @@
-d27ca91fe2cac07b5309bebfdd40c319  rawtherapee-3.0-a1.tar.bz2
+7fa2b72779719674130425906aa1e6ad  rawtherapee-3.0-a1-fork.tar.bz2


--- rawtherapee-lcms.patch DELETED ---


--- rawtherapee-rawzor.patch DELETED ---

