[seqan] Update to 2.0.0
Antonio Trande
sagitter at fedoraproject.org
Mon Feb 16 19:33:55 UTC 2015
commit 52af752c25ae5b83ee297898ce98aaf7f07ce51b
Author: sagitter <sagitterATfedoraprojectDOTorg>
Date: Mon Feb 16 20:33:32 2015 +0100
Update to 2.0.0
.gitignore | 1 +
seqan-docpath.patch | 2 +-
seqan-exclude_manual_test.patch | 20 ------------------
seqan-exclude_splazers_fiona_tests.patch | 23 +++++++++++++++++++++
seqan.spec | 32 +++++++++++++++++++----------
seqan_fix_installation.patch | 14 +------------
sources | 2 +-
7 files changed, 48 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f828f12..a289a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/seqan-src-1.4.1.tar.gz
/seqan-src-1.4.2.tar.gz
/seqan-seqan-v2.0.0-rc1.tar.gz
+/seqan-seqan-v2.0.0.tar.gz
diff --git a/seqan-docpath.patch b/seqan-docpath.patch
index 284d7b1..0e31f73 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
-@@ -309,6 +309,7 @@
+@@ -310,6 +310,7 @@
else ()
set (SEQAN_PREFIX_SHARE "share/${APP_NAME}")
set (SEQAN_PREFIX_SHARE_DOC "share/doc/${APP_NAME}")
diff --git a/seqan-exclude_splazers_fiona_tests.patch b/seqan-exclude_splazers_fiona_tests.patch
new file mode 100644
index 0000000..f6177a5
--- /dev/null
+++ b/seqan-exclude_splazers_fiona_tests.patch
@@ -0,0 +1,23 @@
+--- 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 @@
+ # App Test
+ # ----------------------------------------------------------------------------
+
+-seqan_add_app_test (splazers)
++# seqan_add_app_test (splazers)
+
+ # ----------------------------------------------------------------------------
+ # 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 @@
+ # App Test
+ # ----------------------------------------------------------------------------
+
+-seqan_add_app_test (fiona)
++# seqan_add_app_test (fiona)
+
+ # ----------------------------------------------------------------------------
+ # Setup Common Tool Description for Generic Workflow Nodes
+
diff --git a/seqan.spec b/seqan.spec
index 2988941..16dee26 100644
--- a/seqan.spec
+++ b/seqan.spec
@@ -1,10 +1,14 @@
+##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: 0.5.rc1%{?dist}
+Release: 1%{?dist}
License: BSD and GPLv3+ and LGPLv3+
URL: http://www.seqan.de/
-Source0: https://github.com/seqan/seqan/archive/seqan-v%{version}-rc1.tar.gz#/seqan-seqan-v%{version}-rc1.tar.gz
+Source0: https://github.com/seqan/seqan/archive/seqan-seqan-v%{version}.tar.gz
## This patch sets a seqan directory for documentation files
Patch0: %{name}-docpath.patch
@@ -12,8 +16,9 @@ Patch0: %{name}-docpath.patch
## This patch fixes some installation paths
Patch1: %{name}_fix_installation.patch
-## build-manual test requires python modules unavailable on Fedora
-Patch2: %{name}-exclude_manual_test.patch
+## Exclude 'splazers' tests
+## See https://github.com/seqan/seqan/issues/761
+Patch2: %{name}-exclude_splazers_fiona_tests.patch
BuildRequires: qt4-devel >= 4.7
BuildRequires: cmake >= 2.8
@@ -57,12 +62,11 @@ Info and testing files of SeqAn's apps.
HTML documentation.
%prep
-%setup -q -n seqan-seqan-v%{version}-rc1
+%setup -q -n seqan-seqan-v%{version}
%patch0 -p0
%patch1 -p0
%patch2 -p0
-
## Remove spurious executable permissions
for i in `find . -perm /111 -type f \( -name "*.h" -o -name "*.cpp" \)`; do
chmod a-x $i
@@ -91,11 +95,7 @@ cmake \
-DCMAKE_SKIP_RPATH:BOOL=YES -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE ../..
export CXXFLAGS="%{optflags}"
-%ifarch %{arm}
make
-%else
-make %{?_smp_mflags}
-%endif
%install
%make_install -C build/Release INSTALL="install -p"
@@ -110,7 +110,9 @@ done
%check
pushd build/Release
-ctest --force-new-ctest-process -V
+
+## build-manual test requires Python modules unavailable in Fedora
+ctest --force-new-ctest-process -V -E build_manual
%files
%license BSD.txt GPLv3+.txt LGPLv3+.txt
@@ -128,6 +130,14 @@ ctest --force-new-ctest-process -V
%{_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
diff --git a/seqan_fix_installation.patch b/seqan_fix_installation.patch
index b51d473..77845f3 100644
--- a/seqan_fix_installation.patch
+++ b/seqan_fix_installation.patch
@@ -1,18 +1,6 @@
---- apps/seqcons2/CMakeLists.orig.txt 2015-02-02 15:51:51.000000000 +0100
-+++ apps/seqcons2/CMakeLists.txt 2015-02-05 16:48:51.078646903 +0100
-@@ -64,8 +64,7 @@
-
- # Install non-binary files for the package to "." for app builds and
- # ${PREFIX}/share/doc/seqcons2 for SeqAn release builds.
--install (FILES LICENSE
-- README
-+install (FILES INFO
- DESTINATION ${SEQAN_PREFIX_SHARE_DOC})
- #install (FILES example/fasta1.fa
- # example/fasta2.fa
--- 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
-@@ -69,7 +69,7 @@
+@@ -76,7 +76,7 @@
${CMAKE_CURRENT_BINARY_DIR}/README.sak.txt
DESTINATION ${SEQAN_PREFIX_SHARE_DOC})
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/sak.1
diff --git a/sources b/sources
index 8e64fb8..5cf024d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f19542679ba83367ce071a34a1752249 seqan-seqan-v2.0.0-rc1.tar.gz
+c59ef91b23194b9a63fbb387d496de00 seqan-seqan-v2.0.0.tar.gz
More information about the scm-commits
mailing list