sagitter pushed to seqan (master). "Downgrading to 1.4.2"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri May 15 16:18:20 UTC 2015
From 492387b6518bcf43b4b204a80772c400a1decab1 Mon Sep 17 00:00:00 2001
From: sagitter <sagitter at fedoraproject.org>
Date: Fri, 15 May 2015 18:17:10 +0200
Subject: Downgrading to 1.4.2
diff --git a/seqan-docpath.patch b/seqan-docpath.patch
index 0e31f73..227307b 100644
--- a/seqan-docpath.patch
+++ b/seqan-docpath.patch
@@ -1,6 +1,6 @@
--- util/cmake/SeqAnBuildSystem-orig.cmake 2013-11-20 10:46:58.000000000 +0100
+++ util/cmake/SeqAnBuildSystem.cmake 2014-06-14 22:28:18.112533516 +0200
-@@ -310,6 +310,7 @@
+@@ -308,6 +308,7 @@
else ()
set (SEQAN_PREFIX_SHARE "share/${APP_NAME}")
set (SEQAN_PREFIX_SHARE_DOC "share/doc/${APP_NAME}")
diff --git a/seqan-exclude_bstools_test.patch b/seqan-exclude_bstools_test.patch
new file mode 100644
index 0000000..ebf3e85
--- /dev/null
+++ b/seqan-exclude_bstools_test.patch
@@ -0,0 +1,23 @@
+--- extras/apps/bs_tools/CMakeLists.orig.txt 2014-10-13 15:03:56.000000000 +0200
++++ extras/apps/bs_tools/CMakeLists.txt 2014-12-02 11:38:23.759795760 +0100
+@@ -106,7 +106,7 @@
+ # ----------------------------------------------------------------------------
+
+ # (weese:) temporarily disabled app test
+-seqan_add_app_test (bs_tools)
++# seqan_add_app_test (bs_tools)
+
+ # ----------------------------------------------------------------------------
+ # CPack Install
+--- core/apps/samcat/CMakeLists.txt 2015-05-15 16:50:20.223867704 +0200
++++ core/apps/samcat/CMakeLists.orig.txt 2014-10-13 15:03:56.000000000 +0200
+@@ -63,7 +63,7 @@
+ # App Test
+ # ----------------------------------------------------------------------------
+
+-seqan_add_app_test (samcat)
++#seqan_add_app_test (samcat)
+
+ # ----------------------------------------------------------------------------
+ # Setup Common Tool Description for Generic Workflow Nodes
+
diff --git a/seqan-exclude_splazers_fiona_tests.patch b/seqan-exclude_splazers_fiona_tests.patch
index f6177a5..9de6a5c 100644
--- a/seqan-exclude_splazers_fiona_tests.patch
+++ b/seqan-exclude_splazers_fiona_tests.patch
@@ -1,6 +1,6 @@
---- apps/splazers/CMakeLists.orig.txt 2014-10-13 15:03:56.000000000 +0200
-+++ apps/splazers/CMakeLists.txt 2014-11-25 10:41:12.804941092 +0100
-@@ -78,7 +78,7 @@
+--- core/apps/splazers/CMakeLists.orig.txt 2014-10-13 15:03:56.000000000 +0200
++++ core/apps/splazers/CMakeLists.txt 2014-11-25 10:41:12.804941092 +0100
+@@ -71,7 +71,7 @@
# App Test
# ----------------------------------------------------------------------------
@@ -9,9 +9,9 @@
# ----------------------------------------------------------------------------
# CPack Install
---- apps/fiona/CMakeLists.orig.txt 2014-10-13 15:03:56.000000000 +0200
-+++ apps/fiona/CMakeLists.txt 2014-11-25 10:45:11.870330056 +0100
-@@ -93,7 +93,7 @@
+--- core/apps/fiona/CMakeLists.orig.txt 2014-10-13 15:03:56.000000000 +0200
++++ core/apps/fiona/CMakeLists.txt 2014-11-25 10:45:11.870330056 +0100
+@@ -79,7 +79,7 @@
# App Test
# ----------------------------------------------------------------------------
diff --git a/seqan.spec b/seqan.spec
index 16dee26..ca6abd6 100644
--- a/seqan.spec
+++ b/seqan.spec
@@ -1,30 +1,26 @@
-##Available arches for SeqAn
-##See https://github.com/seqan/seqan/issues/830
-ExclusiveArch: %ix86 x86_64
-
Name: seqan
Summary: Open source C++ library of efficient algorithms and data structures
-Version: 2.0.0
-Release: 1%{?dist}
+Version: 1.4.2
+Release: 10%{?dist}
License: BSD and GPLv3+ and LGPLv3+
URL: http://www.seqan.de/
-Source0: https://github.com/seqan/seqan/archive/seqan-seqan-v%{version}.tar.gz
+Source0: http://packages.seqan.de/seqan-src/seqan-src-%{version}.tar.gz
+
+## https://bugzilla.redhat.com/show_bug.cgi?id=1221982
+ExcludeArch: s390 s390x
## This patch sets a seqan directory for documentation files
Patch0: %{name}-docpath.patch
-## This patch fixes some installation paths
-Patch1: %{name}_fix_installation.patch
-
-## Exclude 'splazers' tests
-## See https://github.com/seqan/seqan/issues/761
-Patch2: %{name}-exclude_splazers_fiona_tests.patch
+## These patches exclude tests of splazers, fiona, bs_tools
+## They fail beacause unknown reasons
+Patch1: %{name}-exclude_splazers_fiona_tests.patch
+Patch2: %{name}-exclude_bstools_test.patch
BuildRequires: qt4-devel >= 4.7
BuildRequires: cmake >= 2.8
BuildRequires: llvm-devel, bzip2-devel, zlib-devel, boost-devel
BuildRequires: coin-or-lemon-devel, openmpi-devel, libstdc++-static
-BuildRequires: python-sphinx, python-sphinx_rtd_theme
## Test
BuildRequires: python2-devel, python-nose, pytest, python-jinja2
@@ -58,14 +54,16 @@ BuildArch: noarch
Requires: %{name}
%description doc
-Info and testing files of SeqAn's apps.
-HTML documentation.
+Info files of SeqAn's apps.
%prep
-%setup -q -n seqan-seqan-v%{version}
+%setup -q -n seqan-%{version}
%patch0 -p0
%patch1 -p0
+
+%ifarch %{arm} aarch64 ppc64 ppc64le
%patch2 -p0
+%endif
## Remove spurious executable permissions
for i in `find . -perm /111 -type f \( -name "*.h" -o -name "*.cpp" \)`; do
@@ -73,13 +71,15 @@ chmod a-x $i
done
## Renamed each single license file
-cp -p apps/rep_sep/LICENSE LGPLv3+.txt
-cp -p apps/rabema/LICENSE GPLv3+.txt
-cp -p LICENSE BSD.txt
+cp -p extras/apps/rep_sep/LICENSE LGPLv3+.txt
+cp -p core/apps/rabema/LICENSE GPLv3+.txt
+cp -p LICENSE BSD.txt
+
+## Make install needs this README file
+cp -p extras/apps/seqan_flexbar/INFO extras/apps/seqan_flexbar/README
%build
mkdir -p build/Release && pushd build/Release
-export LDFLAGS="%{__global_ldflags} -Wl,--as-needed"
cmake \
-DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
@@ -87,21 +87,31 @@ cmake \
-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
-DBUILD_SHARED_LIBS:BOOL=OFF \
- -DSEQAN_BUILD_SYSTEM:STRING=SEQAN_RELEASE -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DCMAKE_BUILD_TYPE:STRING=Release -DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS \
-DSEQAN_HAS_BZIP2=1 -DSEQAN_HAS_ZLIB=1 -DSEQAN_APP_VERSION:STRING=%{version} \
- -DBZIP2_INCLUDE_DIR:PATH=%{_includedir} -DBZIP2_LIBRARY:FILEPATH="-L%{_libdir} -lbz2" \
-DZLIB_INCLUDE_DIR:PATH=%{_includedir} -DZLIB_LIBRARY:FILEPATH="-L%{_libdir} -lz" \
- -DBoost_INCLUDE_DIR:PATH=%{_includedir} -DYARA_ARCH_NATIVE:BOOL=ON \
- -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE ../..
+ -DBZIP2_INCLUDE_DIR:PATH=%{_includedir} -DBZIP2_LIBRARY:FILEPATH="-L%{_libdir} -lbz2" \
+ -DLEMON_INCLUDE_DIR:PATH=%{_includedir} -DLEMON_LIBRARY:FILEPATH="-L%{_libdir} -lemon" \
+ -DBoost_INCLUDE_DIR:PATH=%{_includedir} \
+ -DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
+ ../..
-export CXXFLAGS="%{optflags}"
-make
+%ifarch %{arm} aarch64 ppc64 ppc64le
+make all
+%else
+make %{?_smp_mflags} all
+%endif
%install
%make_install -C build/Release INSTALL="install -p"
-## Remove demos directory
-rm -rf %{buildroot}%{_docdir}/%{name}/demos
+## Put header files in ad-hoc include directory
+mkdir -p %{buildroot}%{_includedir}/seqan
+cp -pr extras/include/seqan/* %{buildroot}%{_includedir}/seqan
+cp -pr core/include/seqan/* %{buildroot}%{_includedir}/seqan
+
+## Rename 'join' binary file; it conflicts with the one owned by 'coreutils' package
+mv %{buildroot}%{_bindir}/join %{buildroot}%{_bindir}/searchjoin
## Fix executable permissions
for i in `find %{buildroot}%{_bindir} -perm /644 -type f \( -name "*.sh" \)`; do
@@ -110,49 +120,31 @@ done
%check
pushd build/Release
-
-## build-manual test requires Python modules unavailable in Fedora
-ctest --force-new-ctest-process -V -E build_manual
+%ifarch %{arm} aarch64 ppc64 ppc64le
+ctest -E app_test_ngs_roi --force-new-ctest-process -VV
+%else
+ctest --force-new-ctest-process -VV %{?_smp_mflags}
+%endif
%files
-%license BSD.txt GPLv3+.txt LGPLv3+.txt
-%doc README.rst
+%doc BSD.txt GPLv3+.txt LGPLv3+.txt README.rst
%{_bindir}/*
-%{_mandir}/man1/sak.*
%files doc
%doc %{_docdir}/seqan
-%doc build/Release/dox/html
%files devel
-%license BSD.txt GPLv3+.txt LGPLv3+.txt
-%doc README.rst
+%doc BSD.txt GPLv3+.txt LGPLv3+.txt README.rst
%{_includedir}/seqan/
%changelog
-* Mon Feb 16 2015 Antonio Trande <sagitterATfedoraproject.org> 2.0.0-1
-- Update to 2.0.0
-- ARM arches excluded
-- Splazers test excluded
-
-* Sat Feb 07 2015 Antonio Trande <sagitterATfedoraproject.org> - 2.0.0-0.6.rc1
-- build-manual test excluded by ctest
-
-* Sat Feb 07 2015 Antonio Trande <sagitterATfedoraproject.org> - 2.0.0-0.5.rc1
-- Exclude build-manual test
-
-* Sat Feb 07 2015 Antonio Trande <sagitterATfedoraproject.org> - 2.0.0-0.4.rc1
-- Built HTML documentation
-- Packaged sak manpages
-
-* Thu Feb 05 2015 Antonio Trande <sagitterATfedoraproject.org> - 2.0.0-0.3.rc1
-- Added python-sphinx_rtd_theme as BR package
-
-* Thu Feb 05 2015 Antonio Trande <sagitterATfedoraproject.org> - 2.0.0-0.2.rc1
-- Fixed installation of some files
+* Thu May 14 2015 Antonio Trande <sagitterATfedoraproject.org> - 1.4.2-10
+- Downgrading to 1.4.2
+- Excluded s390 s390x arches
+- Excluded bstools_test on ARMs aarch64 ppc64 ppc64le
-* Tue Feb 03 2015 Antonio Trande <sagitterATfedoraproject.org> - 2.0.0-0.1.rc1
-- Update to 2.0.0-rc1
+* Mon Jan 26 2015 Petr Machata <pmachata at redhat.com> - 1.4.2-9
+- Rebuild for boost 1.57.0
* Tue Dec 02 2014 Antonio Trande <sagitterATfedoraproject.org> - 1.4.2-8
- Excluded bs_tools test on ARM
diff --git a/seqan_fix_installation.patch b/seqan_fix_installation.patch
deleted file mode 100644
index 77845f3..0000000
--- a/seqan_fix_installation.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- apps/sak/CMakeLists.orig.txt 2015-02-02 15:51:51.000000000 +0100
-+++ apps/sak/CMakeLists.txt 2015-02-07 18:05:34.412374795 +0100
-@@ -76,7 +76,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/README.sak.txt
- DESTINATION ${SEQAN_PREFIX_SHARE_DOC})
- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sak.1
-- DESTINATION ${SEQAN_PREFIX_SHARE_DOC}/man)
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
-
- # ----------------------------------------------------------------------------
- # App Test
-
diff --git a/sources b/sources
index 5cf024d..ead6724 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c59ef91b23194b9a63fbb387d496de00 seqan-seqan-v2.0.0.tar.gz
+e7d2c6cf6474b5186c27ec31bd32738a seqan-src-1.4.2.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/seqan.git/commit/?h=master&id=492387b6518bcf43b4b204a80772c400a1decab1
More information about the scm-commits
mailing list