Accepting request 768241 from graphics

OBS-URL: https://build.opensuse.org/request/show/768241
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=84

darktable.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jan 28 16:04:17 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
+
+- Fix the RPATH which is broken because of an invalid cmake macro
+  * Correct fix for (boo#1160739)
+  * CMake fix: https://build.opensuse.org/request/show/764183
+- Fix version number in Debian/Ubuntu builds
+
 -------------------------------------------------------------------
 Mon Jan 13 06:20:20 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>
 

darktable.dsc

@@ -1,10 +1,10 @@
-Format: 3.0 (native)
+Format: 3.0 (quilt)
 Source: darktable
 Section: graphics
 Priority: optional
 Binary: darktable darktable-tools-basecurve darktable-tools-noise
 Architecture: any-amd64 any-arm64
-Version: 0
+Version: 3.0.0-1.1
 Homepage: http://www.darktable.org/
 Build-Depends: cmake,
                debhelper (>= 10),

darktable.spec

@@ -216,6 +216,7 @@ rm -rf src/external/lua/
 
 %build
 %define cmake_options \\\
+   -DCMAKE_INSTALL_LIBDIR=%{_lib} \\\
    -DCMAKE_SKIP_RPATH:BOOL=OFF \\\
    -DCMAKE_INSTALL_DATAROOTDIR="share" \\\
    -DCMAKE_INSTALL_LIBEXECDIR="%{_libexecdir}" \\\
@@ -257,7 +258,7 @@ pushd %{_target_platform}
   -DDONT_USE_INTERNAL_LUA=ON \
   %ifarch aarch64
   -DTESTBUILD_OPENCL_PROGRAMS=OFF \
-  %endif  
+  %endif
   %{cmake_options} ..
 make %{_smp_mflags} VERBOSE=1
 
@@ -267,7 +268,6 @@ make %{_smp_mflags} VERBOSE=1
 %if 0%{?suse_version}
 # suse branch
 %cmake_install
-mv %{buildroot}%{_libdir}/darktable/libdarktable.so %{buildroot}%{_libdir}
 %suse_update_desktop_file darktable
 #/ suse branch
 %else
@@ -275,6 +275,7 @@ mv %{buildroot}%{_libdir}/darktable/libdarktable.so %{buildroot}%{_libdir}
 %make_install -C %{_target_platform}
 #/ fedora branch
 %endif
+
 %find_lang darktable
 
 cp -av %{S:1} %{S:2} %{S:3} %{S:4} doc/TODO \
@@ -313,7 +314,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >/dev/null 2>/dev/null || :
 %{_bindir}/darktable-cmstest
 %{_bindir}/darktable-rs-identify
 %{_libdir}/darktable
-%{_libdir}/libdarktable.so
 %{_datadir}/applications/darktable.desktop
 %{_datadir}/darktable
 %exclude %{_datadir}/%{pkg_name}/tools/basecurve/

debian.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:659639c211c06a95c1520cbe58bf4b136462e39ef9973b4c6331494bd7face0d
+oid sha256:36b1aac62bbaca09d409d4331f6a2c2d35a040d22737dbf4eb3d81596c0a6e3d
-size 20816
+size 21032