rpms/rawtherapee/devel .cvsignore, 1.3, 1.4 import.log, 1.6, 1.7 rawtherapee.spec, 1.7, 1.8 sources, 1.7, 1.8

[Thibault North]

Author: tnorth

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

Modified Files:
	.cvsignore import.log rawtherapee.spec sources 
Log Message:
New release, now using official repo, not the fork



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Mar 2010 05:30:34 -0000	1.3
+++ .cvsignore	27 Apr 2010 12:25:19 -0000	1.4
@@ -1 +1 @@
-rawtherapee-3.0-a1-fork.tar.bz2
+rawtherapee-3.0-a1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- import.log	16 Apr 2010 21:30:08 -0000	1.6
+++ import.log	27 Apr 2010 12:25:19 -0000	1.7
@@ -4,3 +4,4 @@ rawtherapee-3_0-0_15_a1_fc12:HEAD:rawthe
 rawtherapee-3_0-0_16_a1_fc12:HEAD:rawtherapee-3.0-0.16.a1.fc12.src.rpm:1271082763
 rawtherapee-3_0-0_17_a1_fc12:HEAD:rawtherapee-3.0-0.17.a1.fc12.src.rpm:1271437624
 rawtherapee-3_0-0_18_a1_fc12:HEAD:rawtherapee-3.0-0.18.a1.fc12.src.rpm:1271453117
+rawtherapee-3_0-0_19_a1_fc12:HEAD:rawtherapee-3.0-0.19.a1.fc12.src.rpm:1272370982


Index: rawtherapee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/rawtherapee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- rawtherapee.spec	16 Apr 2010 21:30:08 -0000	1.7
+++ rawtherapee.spec	27 Apr 2010 12:25:19 -0000	1.8
@@ -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.19.%{prerelease}%{?dist}
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -42,26 +40,12 @@ 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
-
-# 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 +78,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache
 fi 
 %{_bindir}/update-desktop-database %{_datadir}/applications || :
 
+/sbin/ldconfig
+
 %postun
 %{_bindir}/update-desktop-database %{_datadir}/applications
 touch --no-create %{_datadir}/icons/hicolor
@@ -101,16 +87,25 @@ if [ -x %{_bindir}/gtk-update-icon-cache
   %{_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 at 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 at fedoraproject.org> - 3.0-0.18.a1
 - New release including curves (exposure and luminance)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rawtherapee/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	16 Apr 2010 21:30:08 -0000	1.7
+++ sources	27 Apr 2010 12:25:19 -0000	1.8
@@ -1 +1 @@
-1b1594521bb94fad552d1ec2fd3301b0  rawtherapee-3.0-a1-fork.tar.bz2
+3248d52ffdee8ad67114864bcbc965f5  rawtherapee-3.0-a1.tar.bz2