sagitter pushed to openms (f22). "Source archive re-compressed by upstream"

[notifications at fedoraproject.org]

From e32d7a19df8bf77b93d4818c8118faea07cc8d4e Mon Sep 17 00:00:00 2001
From: sagitter <sagitter at fedoraproject.org>
Date: Fri, 1 May 2015 21:59:00 +0200
Subject: Source archive re-compressed by upstream


diff --git a/.gitignore b/.gitignore
index 3631091..5c530cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /OpenMS-1.11.1.tar.gz
 /OpenMS-2.0.0_src.zip
+/OpenMS-Release2.0.0.tar.gz
diff --git a/openms.spec b/openms.spec
index b3bfa10..4be15b9 100644
--- a/openms.spec
+++ b/openms.spec
@@ -8,10 +8,10 @@
 Name:      openms
 Summary:   LC/MS data management and analyses
 Version:   2.0.0
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   BSD
 URL:       http://open-ms.sourceforge.net/
-Source0:   http://sourceforge.net/projects/open-ms/files/OpenMS/OpenMS-%{version}/OpenMS-%{version}_src.zip
+Source0:   https://github.com/OpenMS/OpenMS/archive/Release2.0.0.tar.gz#/OpenMS-Release%{version}.tar.gz
 
 ##TOPPView, TOPPAS, INIFileEditor .desktop and icon files
 Source1:   TOPPView.xpm
@@ -34,7 +34,7 @@ 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
+BuildRequires: xorg-x11-server-Xvfb, gnuplot
 
 Requires: XTandem
 Requires: %{name}-data = %{version}-%{release}
@@ -141,18 +141,13 @@ BuildArch: noarch
 The OpenMS data files.
 
 %prep
-%setup -q -n OpenMS-master
+%setup -q -n OpenMS-Release%{version}
 rm -rf cmake/MacOSX
 
 ## Strip all .png files 
 ## 'iCCP: known incorrect sRGB profile' warnings
 find . -type f -name "*.png" -exec convert {} -strip {} \;
 
-## Convert file to Unix format
-#dos2unix share/OpenMS/OpenMS_DB.sql
-#dos2unix share/OpenMS/CV/psi-mzdata.obo
-#dos2unix doc/html/style_ini.css
-
 %if 0%{?with_pyOpenMS}
 %patch0 -p0
 %patch1 -p0
@@ -168,7 +163,7 @@ export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
  -DCMAKE_CXX_FLAGS_RELEASE:STRING="-Wno-cpp $RPM_OPT_FLAGS" -DCMAKE_C_FLAGS_RELEASE:STRING="-Wno-cpp $RPM_OPT_FLAGS" \
  -DCMAKE_VERBOSE_MAKEFILE=TRUE -DCMAKE_PREFIX_PATH=%{_prefix} \
  -DENABLE_SVN=OFF -DCMAKE_BUILD_TYPE=Release -DBOOST_USE_STATIC=OFF \
- -DCMAKE_SKIP_RPATH=YES -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \
+ -DCMAKE_SKIP_RPATH:BOOL=TRUE -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \
  -DMT_ENABLE_OPENMP=ON -DENABLE_GCC_WERROR:BOOL=OFF \
  -DXTANDEM_BINARY=%{_bindir}/tandem \
  -DBOOST_USE_STATIC:BOOL=OFF -DBoost_INCLUDE_DIR:PATH=%{_includedir} \
@@ -213,8 +208,9 @@ 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}%{python2_sitearch}/pyopenms/libOpenMS.so
-ln -s -f %{_libdir}/libOpenSwathAlgo.so.2.0.0 %{buildroot}%{python2_sitearch}/pyopenms/libOpenSwathAlgo.so
+ln -s -f %{_libdir}/OpenMS/libOpenMS.so %{buildroot}%{python2_sitearch}/pyopenms/libOpenMS.so
+ln -s -f %{_libdir}/OpenMS/libOpenSwathAlgo.so %{buildroot}%{python2_sitearch}/pyopenms/libOpenSwathAlgo.so
+ln -s -f %{_libdir}/OpenMS/libSuperHirn.so %{buildroot}%{python2_sitearch}/pyopenms/libSuperHirn.so
 
 ## Fix standard permissions 
 chmod 0755 %{buildroot}%{python2_sitearch}/pyopenms/pyopenms.so
@@ -264,8 +260,8 @@ xvfb-run -a ctest -R OpenMS_ --force-new-ctest-process %{?_smp_mflags}
 ##pyOpenMS tests including mem leak
 %if 0%{?with_pyOpenMS}
 cd pyOpenMS
-%{__python2} ./run_nose.py
 %{__python2} ./run_memleaks.py
+#%%{__python2} ./run_nose.py
 %endif
 
 %files
@@ -376,7 +372,7 @@ cd pyOpenMS
 %{_datadir}/applications/toppview.desktop
 %{_datadir}/applications/inifileeditor.desktop
 %{_datadir}/icons/TOPP/
-%{_libdir}/OpenMS/lib*.so
+%{_libdir}/OpenMS/
 
 %files tools
 %{_bindir}/FileFilter
@@ -458,6 +454,10 @@ cd pyOpenMS
 %endif
 
 %changelog
+* 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
+
 * Fri May 01 2015 Antonio Trande <sagitter at fedoraproject.org> 2.0.0-5
 - SPEC cleanups
 
diff --git a/sources b/sources
index c09b2bc..bd2c732 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65fdd44b06d12af9a9e4961b8654420a  OpenMS-2.0.0_src.zip
+ff7f8bce326560525d8c56249f8d367a  OpenMS-Release2.0.0.tar.gz
-- 
cgit v0.10.2


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