Hello community,
here is the log from the commit of package dcmtk for openSUSE:Factory checked in at 2017-08-24 18:42:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dcmtk (Old)
and /work/SRC/openSUSE:Factory/.dcmtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcmtk"
Thu Aug 24 18:42:06 2017 rev:13 rq:512564 version:3.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/dcmtk/dcmtk.changes 2012-08-31 09:21:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dcmtk.new/dcmtk.changes 2017-08-24 18:42:09.583932419 +0200
@@ -1,0 +2,19 @@
+Tue Jul 25 16:04:25 UTC 2017 - tittiatcoke@gmail.com
+
+- Update to version 3.6.2
+ * See DOCS/Changes.362 for more information
+
+- Build against the internal CharLS library. Only version 1.0 is
+ supported and Factory offers version 2.0
+ * Drop patches:
+ - dcmtk-3.6.0-0004-Use-system-charls.patch
+ - dcmtk-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch
+ - dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch
+- Drop patches due to updated build system and upstream integration:
+ * dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch
+ * dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch
+ * dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch
+ * dcmtk-3.6.0.diff
+ * gcc-4.7_fix.patch
+
+-------------------------------------------------------------------
Old:
----
dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch
dcmtk-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch
dcmtk-3.6.0-0004-Use-system-charls.patch
dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch
dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch
dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch
dcmtk-3.6.0.diff
dcmtk-3.6.0.tar.gz
gcc-4.7_fix.patch
New:
----
dcmtk-3.6.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dcmtk.spec ++++++
--- /var/tmp/diff_new_pack.BOqDU0/_old 2017-08-24 18:42:11.707633237 +0200
+++ /var/tmp/diff_new_pack.BOqDU0/_new 2017-08-24 18:42:11.711632674 +0200
@@ -19,32 +19,15 @@
%define libname libdcmtk3_6
Name: dcmtk
-Version: 3.6.0
+Version: 3.6.2
Release: 0
Summary: DICOM Toolkit
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/dcmtk360/%{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch asterios.dramis@gmail.com -- Add soname information for all targets
-Patch0: dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch
+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.dramis@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-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch asterios.dramis@gmail.com -- Removed bundled libcharl reference in dcmjpls
-Patch2: dcmtk-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch
-# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0004-Use-system-charls.patch asterios.dramis@gmail.com -- Use system charls
-Patch3: dcmtk-3.6.0-0004-Use-system-charls.patch
-# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch asterios.dramis@gmail.com -- Fix includes for CharLS 1.0
-Patch4: dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch
-# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch asterios.dramis@gmail.com -- Add optional support for building shared libraries with CMake
-Patch5: dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch
-# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch asterios.dramis@gmail.com -- Add soname generation for modules which are not in DCMTK_MODULES variable
-Patch6: dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch
-# PATCH-FIX-OPENSUSE dcmtk-3.6.0.diff asterios.dramis@gmail.com -- Fix libraries linking
-Patch7: dcmtk-3.6.0.diff
-# PATCH-FIX-UPSTREAM gcc-4.7_fix.patch asterios.dramis@gmail.com -- Fix compilation with gcc-4.7
-Patch8: gcc-4.7_fix.patch
-BuildRequires: CharLS-devel
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: fdupes
@@ -53,6 +36,7 @@
BuildRequires: libpng-devel
BuildRequires: libsndfile-devel
BuildRequires: libtiff-devel
+BuildRequires: libjpeg-devel
BuildRequires: tcpd-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(libxml-2.0)
@@ -81,18 +65,7 @@
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7
-%patch8 -p1
-
-# Make sure the internal library copy is not used
-rm -rf dcmjpls/libcharls/
%build
mkdir build
@@ -124,9 +97,6 @@
# Remove zero-length file (fix rpmlint warning)
rm -f %{buildroot}%{_datadir}/dcmtk/wlistdb/OFFIS/lockfile
-# Fix binary name
-mv -f %{buildroot}%{_bindir}/dcmsign-3.6.0 %{buildroot}%{_bindir}/dcmsign
-
# Move configuration files from /usr/etc to /etc/
mv %{buildroot}%{_prefix}/etc %{buildroot}
@@ -150,14 +120,17 @@
%{_bindir}/*
%{_datadir}/dcmtk/
%doc %{_docdir}/dcmtk/
+%doc %{_mandir}/man1/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/dcmtk/
%{_libdir}/*.so
+%{_libdir}/cmake/dcmtk/
%files -n %{libname}
%defattr(-,root,root,-)
%{_libdir}/*.so.3.6*
+%{_libdir}/*.so.12
%changelog
++++++ dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch ++++++
--- /var/tmp/diff_new_pack.BOqDU0/_old 2017-08-24 18:42:11.799620279 +0200
+++ /var/tmp/diff_new_pack.BOqDU0/_new 2017-08-24 18:42:11.803619715 +0200
@@ -1,25 +1,19 @@
-From 8401d7914ef110d5aca35bf7e1409341c533f1e4 Mon Sep 17 00:00:00 2001
-From: Mario Ceresa