sagitter pushed to openms (f21). "PyOpenMS compiled without parallel make; PyOpenMS tests disabled."

[notifications at fedoraproject.org]

From 541428cd66a5fb50b9c3304b80ba4559dd579d9c Mon Sep 17 00:00:00 2001
From: sagitter <sagitter at fedoraproject.org>
Date: Sat, 2 May 2015 11:30:51 +0200
Subject: PyOpenMS compiled without parallel make; PyOpenMS tests disabled.


diff --git a/openms-fix-python_tests.patch b/openms-fix-python_tests.patch
new file mode 100644
index 0000000..da1bdd0
--- /dev/null
+++ b/openms-fix-python_tests.patch
@@ -0,0 +1,37 @@
+--- src/pyOpenMS/tests/unittests/test.indexed.orig.mzML	2015-04-09 17:57:04.000000000 +0200
++++ src/pyOpenMS/tests/unittests/test.indexed.mzML	2015-05-01 21:50:40.523915224 +0200
+@@ -28,7 +28,7 @@
+ 			<cvParam cvRef="MS" accession="MS:1000799" name="custom unreleased software tool" value="" />
+ 		</software>
+ 		<software id="so_dp_sp_0_pm_0" version="1.4.0" >
+-			<cvParam cvRef="MS" accession="MS:1000615" name="ProteoWizard" />
++			<cvParam cvRef="MS" accession="MS:1000615" name="ProteoWizard software" />
+ 		</software>
+ 		<software id="so_dp_sp_0_pm_1" version="1.11.0" >
+ 			<cvParam cvRef="MS" accession="MS:1000757" name="FileFilter" />
+@@ -274,4 +274,4 @@
+   </indexList>
+   <indexListOffset>655460</indexListOffset>
+ <fileChecksum>0</fileChecksum>
+-</indexedmzML>
+\ No newline at end of file
++</indexedmzML>
+--- src/pyOpenMS/tests/unittests/test2.orig.mzML	2015-04-09 17:57:04.000000000 +0200
++++ src/pyOpenMS/tests/unittests/test2.mzML	2015-05-01 21:49:41.658250791 +0200
+@@ -11,7 +11,7 @@
+ 		<sourceFileList count="1">
+ 			<sourceFile id="sf_ru_0" name="file://IBT-RABEAM/Data/andersm/B08-08318.RAW" location="">
+ 				<cvParam cvRef="MS" accession="MS:1000569" name="SHA-1" value="8050207fea87c7c97555c6bb83fa50312b24fbbe" />
+-				<cvParam cvRef="MS" accession="MS:1000564" name="PSI mzData file" />
++				<cvParam cvRef="MS" accession="MS:1000564" name="PSI mzData format" />
+ 				<cvParam cvRef="MS" accession="MS:1000777" name="spectrum identifier nativeID format" />
+ 			</sourceFile>
+ 		</sourceFileList>
+@@ -304,4 +304,4 @@
+ 			</spectrum>
+ 		</spectrumList>
+ 	</run>
+-</mzML>
+\ No newline at end of file
++</mzML>
+
diff --git a/openms.spec b/openms.spec
index 4be15b9..a904b50 100644
--- a/openms.spec
+++ b/openms.spec
@@ -8,7 +8,7 @@
 Name:      openms
 Summary:   LC/MS data management and analyses
 Version:   2.0.0
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   BSD
 URL:       http://open-ms.sourceforge.net/
 Source0:   https://github.com/OpenMS/OpenMS/archive/Release2.0.0.tar.gz#/OpenMS-Release%{version}.tar.gz
@@ -49,6 +49,9 @@ Patch1: %{name}-setuptools.patch
 ##Remove -O0 flag for tests compiling
 Patch2: %{name}-remove_testflag.patch
 
+##Fix mzML unittests
+Patch3: %{name}-fix-python_tests.patch
+
 %description
 OpenMS is an open-source C++ library for LC/MS data management and analyses.
 It offers an infrastructure for the rapid development 
@@ -151,6 +154,7 @@ find . -type f -name "*.png" -exec convert {} -strip {} \;
 %if 0%{?with_pyOpenMS}
 %patch0 -p0
 %patch1 -p0
+%patch3 -p0
 %endif
 
 %patch2 -p0
@@ -187,7 +191,8 @@ export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
 %endif
 
 %if 0%{?with_pyOpenMS}
-make %{?_smp_mflags} OpenMS TOPP UTILS GUI pyopenms
+make %{?_smp_mflags} OpenMS TOPP UTILS GUI 
+make pyopenms
 %else
 make %{?_smp_mflags} OpenMS TOPP UTILS GUI
 %endif
@@ -447,13 +452,17 @@ cd pyOpenMS
 
 %if 0%{?with_pyOpenMS}
 %files -n python2-openms
-%license pyOpenMS/License.txt
-%doc pyOpenMS/README*
+%license src/pyOpenMS/License.txt
 %{python2_sitearch}/pyopenms/
 %{python2_sitearch}/pyopenms-*.egg-info/
 %endif
 
 %changelog
+* Sat May 02 2015 Antonio Trande <sagitter at fedoraproject.org> 2.0.0-7
+- mzML unittests patched
+- PyOpenMS compiled without parallel make
+- PyOpenMS tests disabled
+
 * Fri May 01 2015 Antonio Trande <sagitter at fedoraproject.org> 2.0.0-6
 - Source archive re-compressed by upstream
 - Sym-linked the library pyopenms/libSuperHirn.so
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openms.git/commit/?h=f21&id=541428cd66a5fb50b9c3304b80ba4559dd579d9c