[packages/darktable] - up to 2.6.0
baggins
baggins at pld-linux.org
Tue Feb 12 22:54:35 CET 2019
commit ecf9bd41c67136cffa25264a8fd2f82d1202c452
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Feb 12 22:52:09 2019 +0100
- up to 2.6.0
darktable.spec | 46 ++++++++++++++++------
rpath.patch | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
x32.patch | 13 -------
3 files changed, 154 insertions(+), 25 deletions(-)
---
diff --git a/darktable.spec b/darktable.spec
index 787590d..3ef367c 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -8,14 +8,14 @@
Summary: darktable - a virtual lighttable and darkroom for photographers
Summary(pl.UTF-8): darktable - wirtualny podświetlany stół i ciemnia dla fotografów
Name: darktable
-Version: 1.4.2
-Release: 7
+Version: 2.6.0
+Release: 1
License: GPL v3
Group: X11/Applications/Graphics
-Source0: http://downloads.sourceforge.net/darktable/%{name}-%{version}.tar.xz
-# Source0-md5: f86554329c2c809ffb009244a6f1d643
+Source0: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: 720d6d4313d6aff0ea34885801846f95
Patch0: cmake-glib.patch
-Patch1: x32.patch
+Patch1: rpath.patch
URL: http://darktable.sourceforge.net/
BuildRequires: GraphicsMagick-devel
%{?with_opencl:BuildRequires: OpenCL-devel}
@@ -58,8 +58,8 @@ BuildRequires: libxml2-progs
BuildRequires: libxslt-progs
BuildRequires: lua52-devel >= 5.2
BuildRequires: openjpeg-devel >= 1.5.0
-BuildRequires: perl-tools-pod
BuildRequires: pango-devel
+BuildRequires: perl-tools-pod
BuildRequires: pkgconfig >= 1:0.22
BuildRequires: sqlite3-devel >= 3
BuildRequires: squish-devel
@@ -88,8 +88,9 @@ darktable to wirtualny podświetlany stół i ciemnia dla fotografów.
%build
install -d build
cd build
-export CXXFLAGS="%{rpmcxxflags} -Wno-narrowing"
+export CXXFLAGS="%{rpmcxxflags}"
%cmake .. \
+ -DCMAKE_BUILD_TYPE=%{!?debug:RELEASE}%{?debug:DEBUG} \
%{?with_vte:-DAPRIL_FOOLS=ON} \
-DBINARY_PACKAGE_BUILD=ON \
-DPROJECT_VERSION:STRING="%{name}-%{version}-%{release}" \
@@ -103,9 +104,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
-
-%{__mv} $RPM_BUILD_ROOT%{_localedir}/pt{_PT,}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
%find_lang %{name} --with-gnome --with-omf
@@ -122,11 +121,16 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc README.md RELEASE_NOTES doc/{AUTHORS,NEWS,README,TODO,TRANSLATORS,grouping.txt}
+%doc AUTHORS CONTRIBUTING.md README.md RELEASE_NOTES.md
+%doc doc/{TRANSLATORS.md,grouping.txt,thumbnail_color_management.txt}
+%doc build/doc/darktablerc.html
%attr(755,root,root) %{_bindir}/darktable
+%attr(755,root,root) %{_bindir}/darktable-chart
%attr(755,root,root) %{_bindir}/darktable-cli
%attr(755,root,root) %{_bindir}/darktable-cltest
-%attr(755,root,root) %{_bindir}/darktable-viewer
+%attr(755,root,root) %{_bindir}/darktable-cmstest
+%attr(755,root,root) %{_bindir}/darktable-generate-cache
+%attr(755,root,root) %{_bindir}/darktable-rs-identify
%{_datadir}/appdata/darktable.appdata.xml
%{_datadir}/darktable
%{_desktopdir}/darktable.desktop
@@ -145,5 +149,23 @@ 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
+%lang(de) %{_mandir}/de/man1/darktable.1*
+%lang(de) %{_mandir}/de/man1/darktable-cli.1*
+%lang(de) %{_mandir}/de/man1/darktable-cltest.1*
+%lang(de) %{_mandir}/de/man1/darktable-cmstest.1*
+%lang(de) %{_mandir}/de/man1/darktable-generate-cache.1*
+%lang(es) %{_mandir}/es/man1/darktable.1*
+%lang(es) %{_mandir}/es/man1/darktable-cli.1*
+%lang(es) %{_mandir}/es/man1/darktable-cltest.1*
+%lang(es) %{_mandir}/es/man1/darktable-cmstest.1*
+%lang(es) %{_mandir}/es/man1/darktable-generate-cache.1*
+%lang(fr) %{_mandir}/fr/man1/darktable.1*
+%lang(fr) %{_mandir}/fr/man1/darktable-cli.1*
+%lang(fr) %{_mandir}/fr/man1/darktable-cltest.1*
+%lang(fr) %{_mandir}/fr/man1/darktable-cmstest.1*
+%lang(fr) %{_mandir}/fr/man1/darktable-generate-cache.1*
%{_mandir}/man1/darktable.1*
%{_mandir}/man1/darktable-cli.1*
+%{_mandir}/man1/darktable-cltest.1*
+%{_mandir}/man1/darktable-cmstest.1*
+%{_mandir}/man1/darktable-generate-cache.1*
diff --git a/rpath.patch b/rpath.patch
new file mode 100644
index 0000000..38c959e
--- /dev/null
+++ b/rpath.patch
@@ -0,0 +1,120 @@
+diff -ur darktable-2.6.0/src/chart/CMakeLists.txt darktable-2.6.0-rpath/src/chart/CMakeLists.txt
+--- darktable-2.6.0/src/chart/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/chart/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -26,7 +26,7 @@
+ endif()
+ set_target_properties(darktable-chart
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+
+ install(TARGETS darktable-chart DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT DTApplication)
+diff -ur darktable-2.6.0/src/cli/CMakeLists.txt darktable-2.6.0-rpath/src/cli/CMakeLists.txt
+--- darktable-2.6.0/src/cli/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/cli/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -17,7 +17,7 @@
+ endif()
+ set_target_properties(darktable-cli
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+
+ install(TARGETS darktable-cli DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT DTApplication)
+diff -ur darktable-2.6.0/src/cltest/CMakeLists.txt darktable-2.6.0-rpath/src/cltest/CMakeLists.txt
+--- darktable-2.6.0/src/cltest/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/cltest/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -17,7 +17,7 @@
+ endif()
+ set_target_properties(darktable-cltest
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+
+ install(TARGETS darktable-cltest DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT DTApplication)
+diff -ur darktable-2.6.0/src/CMakeLists.txt darktable-2.6.0-rpath/src/CMakeLists.txt
+--- darktable-2.6.0/src/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -857,7 +857,7 @@
+ endif()
+ set_target_properties(darktable
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+
+ install(TARGETS darktable DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT DTApplication)
+diff -ur darktable-2.6.0/src/generate-cache/CMakeLists.txt darktable-2.6.0-rpath/src/generate-cache/CMakeLists.txt
+--- darktable-2.6.0/src/generate-cache/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/generate-cache/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -17,7 +17,7 @@
+ endif()
+ set_target_properties(darktable-generate-cache
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+
+ install(TARGETS darktable-generate-cache DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT DTApplication)
+diff -ur darktable-2.6.0/src/imageio/format/CMakeLists.txt darktable-2.6.0-rpath/src/imageio/format/CMakeLists.txt
+--- darktable-2.6.0/src/imageio/format/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/imageio/format/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -45,7 +45,7 @@
+ endif()
+ set_target_properties(${module}
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+ install(TARGETS ${module} DESTINATION ${CMAKE_INSTALL_LIBDIR}/darktable/plugins/imageio/format COMPONENT DTApplication)
+ endforeach(module)
+diff -ur darktable-2.6.0/src/imageio/storage/CMakeLists.txt darktable-2.6.0-rpath/src/imageio/storage/CMakeLists.txt
+--- darktable-2.6.0/src/imageio/storage/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/imageio/storage/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -34,7 +34,7 @@
+ endif()
+ set_target_properties(${module}
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+ install(TARGETS ${module} DESTINATION ${CMAKE_INSTALL_LIBDIR}/darktable/plugins/imageio/storage COMPONENT DTApplication)
+ endforeach(module)
+diff -ur darktable-2.6.0/src/iop/CMakeLists.txt darktable-2.6.0-rpath/src/iop/CMakeLists.txt
+--- darktable-2.6.0/src/iop/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/iop/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -51,7 +51,7 @@
+ endif()
+ set_target_properties(${_lib}
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+
+ install(TARGETS ${_lib} DESTINATION ${CMAKE_INSTALL_LIBDIR}/darktable/plugins COMPONENT DTApplication)
+diff -ur darktable-2.6.0/src/libs/CMakeLists.txt darktable-2.6.0-rpath/src/libs/CMakeLists.txt
+--- darktable-2.6.0/src/libs/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/libs/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -128,7 +128,7 @@
+ endif()
+ set_target_properties(${module}
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+ install(TARGETS ${module} DESTINATION ${CMAKE_INSTALL_LIBDIR}/darktable/plugins/lighttable COMPONENT DTApplication)
+ endforeach(module)
+diff -ur darktable-2.6.0/src/views/CMakeLists.txt darktable-2.6.0-rpath/src/views/CMakeLists.txt
+--- darktable-2.6.0/src/views/CMakeLists.txt 2018-12-24 10:31:27.000000000 +0100
++++ darktable-2.6.0-rpath/src/views/CMakeLists.txt 2019-02-12 22:47:11.354692008 +0100
+@@ -45,7 +45,7 @@
+ endif()
+ set_target_properties(${module}
+ PROPERTIES
+- INSTALL_RPATH ${RPATH_DT}/../${CMAKE_INSTALL_LIBDIR}/darktable)
++ INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR}/darktable)
+ endif(WIN32)
+
+ install(TARGETS ${module} DESTINATION ${CMAKE_INSTALL_LIBDIR}/darktable/views COMPONENT DTApplication)
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index f4bec7c..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- darktable-1.4.2/cmake/modules/FindGTK2.cmake~ 2014-04-22 16:59:56.000000000 +0000
-+++ darktable-1.4.2/cmake/modules/FindGTK2.cmake 2015-07-16 20:31:39.503966178 +0000
-@@ -173,8 +173,10 @@
- # look in debian/ubuntu multi-arch path (needs cmake >= 2.85~rc2)
- /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
- /usr/local/lib64
-+ /usr/local/libx32
- /usr/local/lib
- /usr/lib64
-+ /usr/libx32
- /usr/lib
- /opt/local/include
- /opt/local/lib
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/darktable.git/commitdiff/ecf9bd41c67136cffa25264a8fd2f82d1202c452
More information about the pld-cvs-commit
mailing list