diff --git a/.gitignore b/.gitignore index 693ea0d..1356ac6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /gdcm-2.6.3.tar.bz2 /gdcm-2.6.5.tar.gz /gdcm-2.6.5.tar.bz2 +/gdcm-2.8.4.tar.bz2 diff --git a/gdcm.spec b/gdcm.spec index b23bb93..7e682d3 100644 --- a/gdcm.spec +++ b/gdcm.spec @@ -1,14 +1,7 @@ -# we don't want to provide private python extension libs -%{?filter_setup: -%filter_provides_in %{python_sitearch}/.*\.so$ -%filter_setup -} - Name: gdcm -Version: 2.6.5 -Release: 19%{?dist} +Version: 2.8.4 +Release: 1%{?dist} Summary: Grassroots DiCoM is a C++ library to parse DICOM medical files -Group: System Environment/Libraries License: BSD URL: http://gdcm.sourceforge.net/wiki/index.php/Main_Page Source0: http://sourceforge.net/projects/gdcm/files/gdcm%202.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2 @@ -61,7 +54,6 @@ anonymize and de-identify DICOM datasets. %package doc Summary: Includes html documentation for gdcm -Group: Documentation BuildArch: noarch %description doc @@ -70,7 +62,6 @@ access upstream documentation for gdcm. %package applications Summary: Includes command line programs for GDCM -Group: Development/Tools Requires: %{name}%{?_isa} = %{version}-%{release} %description applications @@ -80,7 +71,6 @@ anonymize, manipulate, concatenate, and view DICOM files. %package devel Summary: Libraries and headers for GDCM -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-applications%{?_isa} = %{version}-%{release} @@ -90,20 +80,18 @@ compile applications based on gdcm %package examples Summary: CSharp, C++, Java, PHP and Python example programs for GDCM -Group: Development/Languages Requires: %{name}%{?_isa} = %{version}-%{release} %description examples GDCM examples %package -n python2-gdcm +Summary: Python binding for GDCM %{?python_provide:%python_provide python2-gdcm} # Remove before F30 Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} -Summary: Python binding for GDCM -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python2-gdcm @@ -112,7 +100,7 @@ used this library with python %package -n python3-gdcm Summary: Python binding for GDCM -Group: Development/Libraries +%{?python_provide:%python_provide python2-gdcm} Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python3-gdcm @@ -195,7 +183,7 @@ pushd %{_target_platform} -DGDCM_USE_SYSTEM_POPPLER:BOOL=OFF popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} popd # end python3 @@ -240,7 +228,7 @@ pushd %{_target_platform} popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install # install python3 build @@ -267,7 +255,6 @@ make test -C %{_target_platform} || exit 0 %postun -p /sbin/ldconfig - %files %doc AUTHORS Copyright.txt README.Copyright.txt README.txt %{_libdir}/*.so.* @@ -291,12 +278,18 @@ make test -C %{_target_platform} || exit 0 %{_datadir}/%{name}/Examples/ %files -n python2-gdcm -%{python2_sitearch}/* +%{python2_sitearch}/%{name}*.py* +%{python2_sitearch}/_%{name}swig.so %files -n python3-gdcm -%{python3_sitearch}/* +%{python3_sitearch}/%{name}*.py +%{python3_sitearch}/_%{name}swig.so +%{python3_sitearch}/__pycache__/%{name}* %changelog +* Tue Jan 09 2018 Igor Gnatenko - 2.8.4-1 +- Update to 2.8.4 + * Sun Dec 10 2017 Björn Esser - 2.6.5-19 - Rebuilt for libjson-c.so.3 diff --git a/sources b/sources index 59f94e4..36e5fc2 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c3fdf111428a0ee0d62751144d17fcc5 gdcm-2.6.5.tar.bz2 -9e73255514b7406f365b615319ed9699 gdcmData.tar.gz +SHA512 (gdcm-2.8.4.tar.bz2) = faa9d7efab8eb998b2a768edc4ba6a9f17d6451641749024fccb71654621c6be3bc8be8ecbdd5e001e2c820b3333bf1f190ffc5b3d3d23839409476268bbd43f