Hello community, here is the log from the commit of package dcmtk for openSUSE:Leap:15.2 checked in at 2020-02-19 18:35:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/dcmtk (Old) and /work/SRC/openSUSE:Leap:15.2/.dcmtk.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcmtk" Wed Feb 19 18:35:38 2020 rev:10 rq:770602 version:3.6.5 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/dcmtk/dcmtk.changes 2020-01-15 14:51:57.033471368 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.dcmtk.new.26092/dcmtk.changes 2020-02-19 18:36:03.761648211 +0100 @@ -1,0 +2,30 @@ +Wed Nov 20 07:26:03 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 3.6.5. See DOCS/CHANGES.365 for more information + * Updated code definitions for DICOM 2018e + * Fix some -Wunused-result warnings warnings + * Fixed CMake error if "FindPkgConfig" is missing + +------------------------------------------------------------------- +Tue Mar 19 11:48:41 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Fix a typo detected by Leap 15.1 +- Update to 3.6.4. See DOCS/CHANGES.364 for more information +- Rebase dcmtk-fix-DCMTKTargets.cmake.patch +- Drop dcmtk-fix-CONFIGURE_PACKAGE_CONFIG_FILE.patch, merged upstream + +------------------------------------------------------------------- +Tue Jul 10 08:13:48 UTC 2018 - [email protected] + +- Add patch to fix path in DCMTKConfig.cmake: + * dcmtk-fix-CONFIGURE_PACKAGE_CONFIG_FILE.patch + +------------------------------------------------------------------- +Fri May 25 18:13:19 UTC 2018 - [email protected] + +- Update to 3.6.3. See DOCS/CHANGES.363 for more information + * Fix some buildsystem issues + * Enabled new TLS versions when using OpenSSL < 1.1.0 +- Drop dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch. + +------------------------------------------------------------------- @@ -16,2 +46 @@ - * See DOCS/Changes.362 for more information - + * See DOCS/CHANGES.362 for more information Old: ---- dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch dcmtk-3.6.2.tar.gz New: ---- dcmtk-3.6.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcmtk.spec ++++++ --- /var/tmp/diff_new_pack.o5EiTb/_old 2020-02-19 18:36:04.361649466 +0100 +++ /var/tmp/diff_new_pack.o5EiTb/_new 2020-02-19 18:36:04.361649466 +0100 @@ -1,7 +1,7 @@ # # spec file for package dcmtk # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,37 +12,37 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define libname libdcmtk3_6 - +%define abiversion 15 Name: dcmtk -Version: 3.6.2 +Version: 3.6.5 Release: 0 Summary: DICOM Toolkit -License: BSD-3-Clause and Apache-2.0 +License: BSD-3-Clause AND Apache-2.0 Group: Productivity/Scientific/Other -Url: http://dicom.offis.de/dcmtk.php.en -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 [email protected] -- Install libs in the correct arch dir -Patch1: dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch +URL: https://dicom.offis.de/dcmtk.php.en +Source0: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/release/%{name}-%{version}.tar.gz # 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 +Patch0: 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: libicu-devel BuildRequires: libtiff-devel +BuildRequires: pkgconfig BuildRequires: tcpd-devel -BuildRequires: zlib-devel +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libopenjp2) +BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libxml-2.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(sndfile) +BuildRequires: pkgconfig(zlib) %description DCMTK is a collection of libraries and applications implementing large @@ -66,42 +66,28 @@ parts the DICOM standard. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build -mkdir build -cd build -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" - cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ +%cmake \ -DINSTALL_DOCDIR=%{_docdir}/dcmtk \ -DINSTALL_HTMDIR=%{_docdir}/dcmtk/html \ -DBUILD_SHARED_LIBS=ON \ - %if "%{_lib}" == "lib64" - -DLIB_SUFFIX=64 \ - %endif -DDCMTK_WITH_XML=ON \ -DDCMTK_WITH_OPENSSL=ON \ -DDCMTK_WITH_SNDFILE=ON \ -DDCMTK_WITH_ZLIB=ON \ - -DDCMTK_WITH_CHARLS=ON \ - -DCMAKE_BUILD_TYPE=release .. -make %{?_smp_mflags} VERBOSE=1 -cd .. + -DDCMTK_WITH_CHARLS=ON +%make_jobs %install -cd build -%make_install -cd .. +%cmake_install # Remove zero-length file (fix rpmlint warning) rm -f %{buildroot}%{_datadir}/dcmtk/wlistdb/OFFIS/lockfile # Move configuration files from /usr/etc to /etc/ -mv %{buildroot}%{_prefix}/etc %{buildroot} +mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot} # Move doc files from /usr/share/doc/dcmtk to /usr/share/doc/packages/dcmtk/ mkdir %{buildroot}%{_docdir} @@ -113,27 +99,27 @@ %fdupes -s %{buildroot} %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%dir %{_sysconfdir}/dcmtk +%license COPYRIGHT +%doc CREDITS FAQ README %config(noreplace) %{_sysconfdir}/dcmtk/*.cfg +%dir %{_sysconfdir}/dcmtk +%doc %{_docdir}/dcmtk/ %{_bindir}/* %{_datadir}/dcmtk/ -%doc %{_docdir}/dcmtk/ -%doc %{_mandir}/man1/* +%{_mandir}/man1/* %files devel -%defattr(-,root,root,-) +%license COPYRIGHT %{_includedir}/dcmtk/ %{_libdir}/*.so %{_libdir}/cmake/dcmtk/ %files -n %{libname} -%defattr(-,root,root,-) -%{_libdir}/*.so.3.6* -%{_libdir}/*.so.12 +%license COPYRIGHT +%{_libdir}/*.so.%{abiversion} +%{_libdir}/*.so.%{abiversion}.3.6* %changelog ++++++ dcmtk-3.6.2.tar.gz -> dcmtk-3.6.5.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/dcmtk/dcmtk-3.6.2.tar.gz /work/SRC/openSUSE:Leap:15.2/.dcmtk.new.26092/dcmtk-3.6.5.tar.gz differ: char 4, line 1 ++++++ dcmtk-fix-DCMTKTargets.cmake.patch ++++++ --- /var/tmp/diff_new_pack.o5EiTb/_old 2020-02-19 18:36:04.389649525 +0100 +++ /var/tmp/diff_new_pack.o5EiTb/_new 2020-02-19 18:36:04.389649525 +0100 @@ -1,29 +1,29 @@ diff --git a/CMake/GenerateCMakeExports.cmake b/CMake/GenerateCMakeExports.cmake -index e231e58..6237c43 100644 +index 9a9feb3..e13332a 100644 --- a/CMake/GenerateCMakeExports.cmake +++ b/CMake/GenerateCMakeExports.cmake @@ -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") +-get_property(DCMTK_EXECUTABLE_TARGETS GLOBAL PROPERTY DCMTK_EXECUTABLE_TARGETS) +-export(TARGETS ${DCMTK_EXECUTABLE_TARGETS} 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_property(DCMTK_EXECUTABLE_TARGETS GLOBAL PROPERTY DCMTK_EXECUTABLE_TARGETS) ++#export(TARGETS ${DCMTK_EXECUTABLE_TARGETS} 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) + get_property(DCMTK_LIBRARY_TARGETS GLOBAL PROPERTY DCMTK_LIBRARY_TARGETS) diff --git a/CMake/dcmtkMacros.cmake b/CMake/dcmtkMacros.cmake -index 2ce1ff1..a73a4bf 100644 +index db0cd51..3501818 100644 --- a/CMake/dcmtkMacros.cmake +++ b/CMake/dcmtkMacros.cmake -@@ -59,7 +59,7 @@ MACRO(DCMTK_ADD_EXECUTABLE PROGRAM) +@@ -64,7 +64,7 @@ macro(DCMTK_ADD_EXECUTABLE PROGRAM) # declare installation files, also export DCMTKTargets.cmake - INSTALL(TARGETS ${PROGRAM} + install(TARGETS ${PROGRAM} - EXPORT DCMTKTargets + # EXPORT DCMTKTargets COMPONENT bin - DESTINATION ${DCMTK_INSTALL_BINDIR}) - ENDIF(BUILD_APPS) + DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif()
