sagitter pushed to openms (f22). "SPEC cleanups"

[notifications at fedoraproject.org]

From 258f8826ba8187bf054465393a1ede2ed014e76f Mon Sep 17 00:00:00 2001
From: sagitter <sagitter at fedoraproject.org>
Date: Fri, 1 May 2015 15:31:22 +0200
Subject: SPEC cleanups


diff --git a/openms.spec b/openms.spec
index 86ffa3c..b3bfa10 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:   4%{?dist}
+Release:   5%{?dist}
 License:   BSD
 URL:       http://open-ms.sourceforge.net/
 Source0:   http://sourceforge.net/projects/open-ms/files/OpenMS/OpenMS-%{version}/OpenMS-%{version}_src.zip
@@ -213,17 +213,12 @@ xvfb-run -a make install DESTDIR=%{buildroot}
 pushd pyOpenMS
 %{__python2} setup.py install --skip-build --root %{buildroot}
 
-ln -s -f %{_libdir}/libOpenMS.so.2.0.0 %{buildroot}%{python3_sitearch}/pyopenms/libOpenMS.so
-ln -s -f %{_libdir}/libOpenSwathAlgo.so.2.0.0 %{buildroot}%{python3_sitearch}/pyopenms/libOpenSwathAlgo.so
+ln -s -f %{_libdir}/libOpenMS.so.2.0.0 %{buildroot}%{python2_sitearch}/pyopenms/libOpenMS.so
+ln -s -f %{_libdir}/libOpenSwathAlgo.so.2.0.0 %{buildroot}%{python2_sitearch}/pyopenms/libOpenSwathAlgo.so
 
 ## Fix standard permissions 
 chmod 0755 %{buildroot}%{python2_sitearch}/pyopenms/pyopenms.so
 popd
-
-## Remove duplicated data file directory
-## and link to /usr/share/OpenMS
-rm -rf %{python3_sitearch}/pyopenms/share/OpenMS
-ln -s %{_datadir}/OpenMS %{buildroot}%{python3_sitearch}/pyopenms/share/OpenMS
 %endif
 
 ##Install TOPPAS/TOPPView .png icons
@@ -463,6 +458,9 @@ cd pyOpenMS
 %endif
 
 %changelog
+* Fri May 01 2015 Antonio Trande <sagitter at fedoraproject.org> 2.0.0-5
+- SPEC cleanups
+
 * Thu Apr 30 2015 Antonio Trande <sagitter at fedoraproject.org> 2.0.0-4
 - Patched pyOpenMS version definition
 - Removed 'pyopenms_bdist_egg' make target
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openms.git/commit/?h=f22&id=258f8826ba8187bf054465393a1ede2ed014e76f