Hello community, here is the log from the commit of package dcmtk for openSUSE:Factory checked in at 2018-05-29 10:44:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dcmtk (Old) and /work/SRC/openSUSE:Factory/.dcmtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcmtk" Tue May 29 10:44:45 2018 rev:16 rq:612298 version:3.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/dcmtk/dcmtk.changes 2017-11-19 11:16:05.205125940 +0100 +++ /work/SRC/openSUSE:Factory/.dcmtk.new/dcmtk.changes 2018-05-29 10:44:57.564405059 +0200 @@ -1,0 +2,8 @@ +Fri May 25 18:13:19 UTC 2018 - christo...@krop.fr + +- 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 +24 @@ - * 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.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcmtk.spec ++++++ --- /var/tmp/diff_new_pack.KEzThg/_old 2018-05-29 10:44:58.224380704 +0200 +++ /var/tmp/diff_new_pack.KEzThg/_new 2018-05-29 10:44:58.228380556 +0200 @@ -1,7 +1,7 @@ # # spec file for package dcmtk # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,19 +17,16 @@ %define libname libdcmtk3_6 - Name: dcmtk -Version: 3.6.2 +Version: 3.6.3 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 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 +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 @@ -39,10 +36,10 @@ BuildRequires: libpng-devel BuildRequires: libsndfile-devel BuildRequires: libtiff-devel +BuildRequires: pkgconfig BuildRequires: tcpd-devel BuildRequires: zlib-devel BuildRequires: pkgconfig(libxml-2.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description DCMTK is a collection of libraries and applications implementing large @@ -66,42 +63,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 .. +%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 +96,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,-) +%license COPYRIGHT +%{_libdir}/*.so.13 %{_libdir}/*.so.3.6* -%{_libdir}/*.so.12 %changelog ++++++ dcmtk-3.6.2.tar.gz -> dcmtk-3.6.3.tar.gz ++++++ ++++ 43186 lines of diff (skipped) ++++++ dcmtk-fix-DCMTKTargets.cmake.patch ++++++ --- /var/tmp/diff_new_pack.KEzThg/_old 2018-05-29 10:44:59.948317086 +0200 +++ /var/tmp/diff_new_pack.KEzThg/_new 2018-05-29 10:44:59.948317086 +0200 @@ -15,15 +15,15 @@ # Get and store libraries to DCMTKTargets.cmake within the build's main dir 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 543a8e3..06d4de6 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} - EXPORT DCMTKTargets + # EXPORT DCMTKTargets COMPONENT bin - DESTINATION ${DCMTK_INSTALL_BINDIR}) + DESTINATION ${CMAKE_INSTALL_BINDIR}) ENDIF(BUILD_APPS)
