[darktable/f13/master: 11/11] Merge branch 'master' into f13

[madko]

commit 0df813668a5332a1b7ad587a28a70a3f43cd7d46
Merge: e22a879 a940de2
Author: Edouard <madko at linuxed.net>
Date:   Wed Feb 16 14:46:55 2011 +0100

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	darktable.spec
    	sources

 .gitignore     |    4 ++++
 darktable.spec |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 sources        |    4 ++++
 3 files changed, 57 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index d6845d3,af9519f..e62f50e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,7 @@@
  /darktable-0.6.tar.gz
  /darktable-0.7.tar.gz
  /darktable-0.7.1.tar.gz
++<<<<<<< HEAD
++=======
+ /darktable-0.8.tar.gz
++>>>>>>> master
diff --cc darktable.spec
index b61ed8d,5992542..b352667
--- a/darktable.spec
+++ b/darktable.spec
@@@ -2,7 -2,7 +2,11 @@@
  %define with_gegl 0
  
  Name:		darktable
++<<<<<<< HEAD
 +Version:	0.7.1
++=======
+ Version:	0.8
++>>>>>>> master
  Release:	1%{?dist}
  Summary:	Utility to organize and develop raw images
  
@@@ -12,6 -12,7 +16,10 @@@ URL:		http://darktable.sourceforge.net/
  Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
++<<<<<<< HEAD
++=======
+ BuildRequires:  cmake
++>>>>>>> master
  BuildRequires:	pkgconfig >= 0.22
  BuildRequires:	intltool, gettext
  BuildRequires:	sqlite-devel
@@@ -19,6 -20,7 +27,10 @@@ BuildRequires:	libjpeg-devel, libpng-de
  BuildRequires:	librsvg2-devel >= 2.26
  BuildRequires:	GConf2-devel, gtk2-devel, cairo-devel, libglade2-devel
  BuildRequires:	lcms-devel
++<<<<<<< HEAD
++=======
+ BuildRequires:  lcms2-devel
++>>>>>>> master
  BuildRequires:	exiv2-devel
  BuildRequires:	lensfun-devel
  BuildRequires:	GConf2
@@@ -32,6 -34,7 +44,10 @@@ BuildRequires:	desktop-file-util
  BuildRequires:	gegl-devel
  %endif
  
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> master
  %description
  Darktable is a virtual light-table and darkroom for photographers:
  it manages your digital negatives in a database and lets you view them
@@@ -44,18 -47,17 +60,30 @@@ It also enables you to develop raw imag
  
  
  %build
++<<<<<<< HEAD
 +%configure	--disable-static \
 +%if 0%{?with_gegl}
 +		--enable-gegl
 +%endif
 +
 +make %{?_smp_mflags}
++=======
+ [ ! -d "buildFedora" ] && mkdir buildFedora
+ cd buildFedora
+ %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_TYPE=Release -DINSTALL_IOP_EXPERIMENTAL=Off -DINSTALL_IOP_LEGACY=Off .. && make %{?_smp_mflags}
++>>>>>>> master
  
  
  %install
  rm -rf $RPM_BUILD_ROOT
  export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
++<<<<<<< HEAD
++make install DESTDIR=$RPM_BUILD_ROOT
++=======
+ cd buildFedora
  make install DESTDIR=$RPM_BUILD_ROOT
+ install -D ../data/darktable.schemas $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/darktable.schemas
++>>>>>>> master
  find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
  %find_lang %{name}
  desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/darktable.desktop
@@@ -88,9 -90,8 +116,14 @@@ gtk-update-icon-cache %{_datadir}/icons
  %preun
  %gconf_schema_remove %{name} 
   
++<<<<<<< HEAD
 +%files -f %{name}.lang
 +%defattr(-,root,root,-)
 +%doc README AUTHORS LICENSE TRANSLATORS
++=======
+ %files -f buildFedora/%{name}.lang 
+ %defattr(-,root,root,-)
++>>>>>>> master
  %{_bindir}/darktable
  %{_libdir}/darktable
  %{_datadir}/applications/darktable.desktop
@@@ -101,6 -102,19 +134,22 @@@
  
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Tue Feb 15 2011 Edouard Bourguignon <madko at linuxed.net> - 0.8-1
+ - Upgrade to version 0.8
+ - Rebuilt using cmake
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Mon Jan 03 2011 Edouard Bourguignon <madko at linuxed.net> - 0.7.1-3
+ - Change exiv2 headers to use the new umbrella header (#666887)
+ 
+ * Sat Jan 01 2011 Rex Dieter <rdieter at fedoraproject.org> - 0.7.1-2
+ - rebuild (exiv2)
+ 
++>>>>>>> master
  * Tue Dec 14 2010 Edouard Bourguignon <madko at linuxed.net> - 0.7.1-1
  - Upgrade to version 0.7.1
  
diff --cc sources
index 774c9c1,9400ed0..48e561c
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +502372506fd5ee86660eff735a9f681c  darktable-0.7.1.tar.gz
++=======
+ 1724601b0d7012a414f5398e5029cb45  darktable-0.8.tar.gz
++>>>>>>> master