[darktable] upgrade to 1.4.1, trying to remove rpath

madko madko at fedoraproject.org
Sun Mar 2 09:49:03 UTC 2014


commit 607c23c0ae8f74c0f2197d11c358bfab2ed05b3c
Author: Edouard Bourguignon <madko at linuxed.net>
Date:   Sun Mar 2 10:43:52 2014 +0100

    upgrade to 1.4.1, trying to remove rpath

 .gitignore     |    1 +
 darktable.spec |   20 ++++++++++++++------
 sources        |    3 +--
 3 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9498561..14c9149 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /try_to_make_dt_compile_with_colord_support_on_fedora.patch
 /darktable-1.4~rc1-nopatents.tar.xz
 /darktable-1.4-nopatents.tar.xz
+/darktable-1.4.1-nopatents.tar.xz
diff --git a/darktable.spec b/darktable.spec
index 549dc64..67143ff 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -2,8 +2,8 @@
 %define with_gegl 0
 
 Name:		darktable
-Version:	1.4
-Release:	2%{?dist}
+Version:	1.4.1
+Release:	1%{?dist}
 Summary:	Utility to organize and develop raw images
 
 Group:		Applications/Multimedia
@@ -70,16 +70,18 @@ It also enables you to develop raw images and enhance them.
 mkdir buildFedora
 pushd buildFedora
 %cmake \
-        -DCMAKE_LIBRARY_PATH:PATH=%{_libdir} \
-        -DDONT_INSTALL_GCONF_SCHEMAS:BOOLEAN=ON \
-        -DUSE_GEO:BOOLEAN=ON \
+        -DCMAKE_LIBRARY_PATH=%{_prefix} \
+	-DLIB_INSTALL=%{_libdir} \
+        -DDONT_INSTALL_GCONF_SCHEMAS=ON \
+        -DUSE_GEO=ON \
 	-DUSE_SQUISH=OFF \
+	-DUSE_COLORD=ON \
         -DCMAKE_BUILD_TYPE:STRING=Release \
 	-DBINARY_PACKAGE_BUILD=1 \
 	-DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}" \
 	.. 
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} VERBOSE=1
 popd
 pushd tools/noise
 make %{?_smp_mflags}
@@ -95,6 +97,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %find_lang %{name}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/darktable
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/darktable/tools/noise
+rm tools/noise/*.c
+rm tools/noise/Makefile
 cp tools/noise/* $RPM_BUILD_ROOT%{_datadir}/darktable/tools/noise/
 
 
@@ -134,6 +138,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/man/man1/darktable-cli.1.gz
 
 %changelog
+* Wed Feb 12 2014 Edouard Bourguignon <madko at linuxed.net> - 1.4.1-1
+- Upgrade to 1.4.1
+- Remove tools source files
+
 * Tue Jan 14 2014 Edouard Bourguignon <madko at linuxed.net> - 1.4-2
 - Add OpenJPEG and WebP support
 - Add missing buildrequires on pod2man
diff --git a/sources b/sources
index 2414734..21cdabb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-fd37e12393ccd8e1cfa955b99dc13715  darktable-generate-nopatents-tarball.sh
-dc01f9968681f031d69a39e3606dbd72  darktable-1.4-nopatents.tar.xz
+b52b3dc1c13fd4e276610775ac8e969b  darktable-1.4.1-nopatents.tar.xz


More information about the scm-commits mailing list