Hello community, here is the log from the commit of package dcmtk for openSUSE:Factory checked in at 2017-11-18 00:20:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dcmtk (Old) and /work/SRC/openSUSE:Factory/.dcmtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcmtk" Sat Nov 18 00:20:41 2017 rev:14 rq:542571 version:3.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/dcmtk/dcmtk.changes 2017-08-24 18:42:09.583932419 +0200 +++ /work/SRC/openSUSE:Factory/.dcmtk.new/dcmtk.changes 2017-11-18 00:20:44.812308598 +0100 @@ -1,0 +2,6 @@ +Fri Nov 17 07:42:55 UTC 2017 - guilla...@opensuse.org + +- Add dcmtk-fix-DCMTKTargets.cmake.patch to fix usage of 'dcmtk-devel' + without 'dcmtk' package + +------------------------------------------------------------------- New: ---- dcmtk-fix-DCMTKTargets.cmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcmtk.spec ++++++ --- /var/tmp/diff_new_pack.biAf2f/_old 2017-11-18 00:20:46.304254278 +0100 +++ /var/tmp/diff_new_pack.biAf2f/_new 2017-11-18 00:20:46.308254131 +0100 @@ -1,7 +1,7 @@ # # spec file for package dcmtk # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,15 +28,17 @@ Source0: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk362/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch asterios.dra...@gmail.com -- Install libs in the correct arch dir Patch1: dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch +# PATCH-FIX-OPENSUSE dcmtk-fix-DCMTKTargets.cmake.patch -- Do not track executables to be able to use dcmtk-devel without dcmtk package +Patch2: dcmtk-fix-DCMTKTargets.cmake.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel BuildRequires: libopenssl-devel BuildRequires: libpng-devel BuildRequires: libsndfile-devel BuildRequires: libtiff-devel -BuildRequires: libjpeg-devel BuildRequires: tcpd-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(libxml-2.0) @@ -66,6 +68,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build mkdir build ++++++ dcmtk-fix-DCMTKTargets.cmake.patch ++++++ --- dcmtk-3.6.2.orig/CMake/GenerateCMakeExports.cmake 2017-11-17 08:38:26.571546846 +0100 +++ dcmtk-3.6.2/CMake/GenerateCMakeExports.cmake 2017-11-17 08:40:31.720374074 +0100 @@ -15,8 +15,9 @@ # DCMTKConfig.cmake will contain options used to build this DCMTK package # Get and store all executable targets to DCMTKTargets.cmake within build's main dir -GET_PROPERTY(DCMTK_EXECUTABLE_TARGETS GLOBAL PROPERTY DCMTK_EXECUTABLE_TARGETS) -EXPORT(TARGETS ${DCMTK_EXECUTABLE_TARGETS} APPEND FILE "${DCMTK_BUILD_CMKDIR}/DCMTKTargets.cmake") +## DO NOT TRACK EXECUTABLES, IT BREAKS usage of 'dcmtk-devel' without 'dcmtk' package +# GET_PROPERTY(DCMTK_EXECUTABLE_TARGETS GLOBAL PROPERTY DCMTK_EXECUTABLE_TARGETS) +# EXPORT(TARGETS ${DCMTK_EXECUTABLE_TARGETS} APPEND FILE "${DCMTK_BUILD_CMKDIR}/DCMTKTargets.cmake") # Get and store libraries to DCMTKTargets.cmake within the build's main dir GET_PROPERTY(DCMTK_LIBRARY_TARGETS GLOBAL PROPERTY DCMTK_LIBRARY_TARGETS)
