- updated to 1.4

diff --git a/cmake-glib.patch b/cmake-glib.patch
index 73ccc7ad953e7c9af228f08b0609014f7576fb0e..a231fa3323e235e4c8f96936c92b20a68f0e7488 100644 (file)
--- a/cmake-glib.patch
+++ b/cmake-glib.patch
@@ -1,9 +1,9 @@
 --- darktable-1.0.5/./cmake/modules/FindGlib.cmake~    2012-07-21 13:44:08.000000000 +0300
 +++ darktable-1.0.5/./cmake/modules/FindGlib.cmake     2012-08-28 21:05:30.233854241 +0300
-@@ -21,7 +21,7 @@
- find_path(GlibConfig_INCLUDE_DIR
+@@ -51,7 +51,7 @@
    NAMES glibconfig.h
-   PATHS ${Glib_PKGCONF_INCLUDE_DIRS} /usr
+   HINTS ${Glib_PKGCONF_INCLUDE_DIRS}
+   PATHS /usr
 -  PATH_SUFFIXES lib/glib-2.0/include ../lib/glib-2.0/include
 +  PATH_SUFFIXES lib64/glib-2.0/include lib/glib-2.0/include ../lib/glib-2.0/include
  )

diff --git a/darktable.spec b/darktable.spec
index 5e715f8af3c7bfd1169c15eebaaca05d086a523c..e9d9f49d97949a2a24d4a28e6ffe0d19da6ba477 100644 (file)
--- a/darktable.spec
+++ b/darktable.spec
@@ -5,21 +5,22 @@
 Summary:       darktable is a virtual lighttable and darkroom for photographers
 Summary(pl.UTF-8):     darktable to wirtualny podświetlany stół i ciemnia dla fotografów
 Name:          darktable
-Version:       1.2
-Release:       3
+Version:       1.4
+Release:       1
 License:       GPL v3
 Group:         X11/Applications/Graphics
 Source0:       http://downloads.sourceforge.net/darktable/%{name}-%{version}.tar.xz
-# Source0-md5: 31bfd13d4786aac4f99d5155a811602b
+# Source0-md5: 896416931ded4579f528cd11edad470c
 Patch0:                cmake-glib.patch
-Patch1:                openexr2.patch
 URL:           http://darktable.sourceforge.net/
 BuildRequires: GConf2
 BuildRequires: GConf2-devel
+BuildRequires: GraphicsMagick-devel
 BuildRequires: OpenEXR-devel >= 2.0
 BuildRequires: SDL-devel
 BuildRequires: cairo-devel
 BuildRequires: cmake
+BuildRequires: colord-devel
 BuildRequires: curl-devel >= 7.18.0
 BuildRequires: dbus-glib-devel >= 0.80
 BuildRequires: desktop-file-utils
@@ -42,6 +43,7 @@ BuildRequires:        libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: librsvg-devel >= 1:2.26
 BuildRequires: libtiff-devel
+BuildRequires: lua52-devel
 BuildRequires: pkgconfig >= 0.22
 BuildRequires: sqlite-devel
 BuildRequires: sqlite3-devel
@@ -61,7 +63,6 @@ darktable to wirtualny podświetlany stół i ciemnia dla fotografów
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 install -d build
@@ -108,10 +109,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/darktable-cli
 %attr(755,root,root) %{_bindir}/darktable-cltest
 %attr(755,root,root) %{_bindir}/darktable-viewer
+%{_datadir}/appdata/darktable.appdata.xml
 %{_datadir}/darktable
 %{_desktopdir}/darktable.desktop
 %{_iconsdir}/hicolor/*/apps/darktable.png
-%{_iconsdir}/hicolor/scalable/apps/darktable.svg
+%{_iconsdir}/hicolor/scalable/apps/darktable*.svg
 %dir %{_libdir}/darktable
 %dir %{_libdir}/darktable/plugins
 %dir %{_libdir}/darktable/plugins/imageio
@@ -125,4 +127,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/darktable/plugins/imageio/storage/*.so
 %attr(755,root,root) %{_libdir}/darktable/plugins/lighttable/*.so
 %attr(755,root,root) %{_libdir}/darktable/views/*.so
-%{_mandir}/man1/darktable.*
+%{_mandir}/man1/darktable.1*
+%{_mandir}/man1/darktable-cli.1*

diff --git a/openexr2.patch b/openexr2.patch
deleted file mode 100644 (file)
index 7ab4daf..0000000
--- a/openexr2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- darktable-1.1.4/src/common/imageio_exr.hh~ 2013-03-09 22:48:35.000000000 +0100
-+++ darktable-1.1.4/src/common/imageio_exr.hh  2013-04-05 08:11:04.499777789 +0200
-@@ -31,7 +31,7 @@
- #include <OpenEXR/ImfStandardAttributes.h>
- 
- // this stores our exif data as a blob.
--namespace Imf
-+namespace Imf_2_0
- {
- class Blob
- {
-@@ -54,7 +54,7 @@
- };
- 
- 
--typedef Imf::TypedAttribute<Imf::Blob> BlobAttribute;
-+typedef Imf_2_0::TypedAttribute<Imf_2_0::Blob> BlobAttribute;
- template <> const char *BlobAttribute::staticTypeName()
- {
-   return "blob";