From 657977aef40d5fd50b38d5fac84de08bc4425061 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter(a)fedoraproject.org>
Date: Thu, 30 Apr 2015 23:03:29 +0200
Subject: Patched pyOpenMS version definition
diff --git a/openms-setuptools.patch b/openms-setuptools.patch
index a61dce9..1e45ea8 100644
--- a/openms-setuptools.patch
+++ b/openms-setuptools.patch
@@ -20,3 +20,12 @@
j = os.path.join
src_pyopenms = j(OPEN_MS_SRC, "src/pyOpenMS")
+@@ -150,7 +150,7 @@
+ packages=["pyopenms"],
+ ext_package="pyopenms",
+
+- version=version + "-" + timestamp,
++ version="2.0",
+
+ maintainer="Uwe Schmitt",
+ maintainer_email="uschmitt(a)mineway.de",
diff --git a/openms.spec b/openms.spec
index ca40137..86ffa3c 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: 3%{?dist}
+Release: 4%{?dist}
License: BSD
URL:
http://open-ms.sourceforge.net/
Source0:
http://sourceforge.net/projects/open-ms/files/OpenMS/OpenMS-%{version}/Op...
@@ -30,8 +30,8 @@ BuildRequires: desktop-file-utils, XTandem
## Build documentation
## Doxygen useful only on SVN versions
-BuildRequires: doxygen
-BuildRequires: dos2unix, graphviz, texlive, ImageMagick, texlive-a4wide
+BuildRequires: doxygen, dos2unix, graphviz
+BuildRequires: texlive, ImageMagick, texlive-a4wide, texlive-xtab
##Xvfb is needed to run a virtual X server used by some tests
BuildRequires: xorg-x11-server-Xvfb
@@ -192,7 +192,7 @@ export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
%endif
%if 0%{?with_pyOpenMS}
-make %{?_smp_mflags} OpenMS TOPP UTILS GUI pyopenms pyopenms_bdist_egg
+make %{?_smp_mflags} OpenMS TOPP UTILS GUI pyopenms
%else
make %{?_smp_mflags} OpenMS TOPP UTILS GUI
%endif
@@ -463,6 +463,10 @@ cd pyOpenMS
%endif
%changelog
+* Thu Apr 30 2015 Antonio Trande <sagitter(a)fedoraproject.org> 2.0.0-4
+- Patched pyOpenMS version definition
+- Removed 'pyopenms_bdist_egg' make target
+
* Thu Apr 30 2015 Antonio Trande <sagitter(a)fedoraproject.org> 2.0.0-3
- PyOpenMS is still compiled against Python2 on Linux
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openms.git/commit/?h=master&id=657...