[dcmtk/f16] skip the EOL conversion step, files are correct (FTBFS due a change in dos2unix)
Dan Horák
sharkcz at fedoraproject.org
Thu Oct 20 09:12:01 UTC 2011
commit 2a3485950176dc4585a6505038077b9ca7920fd1
Author: Dan Horák <dan at danny.cz>
Date: Thu Oct 20 11:11:01 2011 +0200
skip the EOL conversion step, files are correct (FTBFS due a change in dos2unix)
dcmtk.spec | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/dcmtk.spec b/dcmtk.spec
index 4f4f0ff..cf6a6b8 100644
--- a/dcmtk.spec
+++ b/dcmtk.spec
@@ -1,7 +1,7 @@
Name: dcmtk
Summary: Offis DICOM Toolkit (DCMTK)
Version: 3.6.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: BSD
Group: Development/Libraries
Source: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/dcmtk-3.6.0.tar.gz
@@ -25,7 +25,6 @@ BuildRequires: openssl-devel
BuildRequires: tcp_wrappers-devel
BuildRequires: zlib-devel
BuildRequires: CharLS-devel
-BuildRequires: dos2unix
BuildRequires: doxygen
%description
@@ -66,7 +65,7 @@ rm -rf dcmjpls/libcharls/
%build
%cmake -DCMAKE_BUILD_TYPE:STRING="Release"\
- -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
-DDCMTK_WITH_OPENSSL:BOOL=ON\
-DDCMTK_WITH_PNG:BOOL=ON\
-DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON\
@@ -94,10 +93,6 @@ mv $RPM_BUILD_ROOT/usr/share/doc $RPM_BUILD_ROOT/usr/share/%{name}-%{version}
mkdir $RPM_BUILD_ROOT/usr/share/doc
mv $RPM_BUILD_ROOT/usr/share/%{name}-%{version} $RPM_BUILD_ROOT/usr/share/doc/
-dos2unix %{buildroot}%{_docdir}/%{name}-%{version}/ciphers.txt
-dos2unix %{buildroot}%{_docdir}/%{name}-%{version}/randseed.txt
-dos2unix %{buildroot}%{_docdir}/%{name}-%{version}/COPYRIGHT
-
# Remove zero-lenght file
rm $RPM_BUILD_ROOT%{_datadir}/%{name}/wlistdb/OFFIS/lockfile
@@ -140,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
%changelog
+* Thu Oct 20 2011 Dan Horák <dan[at]danny.cz> 3.6.0-7
+- skip the EOL conversion step, files are correct (FTBFS due a change in dos2unix)
+
* Wed Oct 19 2011 Mario Ceresa <mrceresa at fedoraproject.org> 3.6.0-6
- Added explicit require for CharLS-devel as requested in #745277
More information about the scm-commits
mailing list