[med-svn] [libbpp-seq] 01/05: New upstream version 2.3.1
Andreas Tille
tille at debian.org
Tue Jun 13 12:55:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libbpp-seq.
commit 28b4469e5364dad747b917ec0b59ab97e56c656d
Author: Andreas Tille <tille at debian.org>
Date: Tue Jun 13 13:33:54 2017 +0200
New upstream version 2.3.1
---
CMakeLists.txt | 15 ++++++++-------
bpp-seq.spec | 29 ++++++++++++++---------------
src/CMakeLists.txt | 11 ++++++-----
3 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 507ac7e..a3be50c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,9 +35,9 @@ ELSE(NO_DEP_CHECK)
# library implements.
# In other words, the library implements all the interface numbers in the
# range from number current - age to current.
-SET(${PROJECT_NAME}_VERSION_CURRENT "10")
-SET(${PROJECT_NAME}_VERSION_REVISION "4")
-SET(${PROJECT_NAME}_VERSION_AGE "1")
+SET(${PROJECT_NAME}_VERSION_CURRENT "11")
+SET(${PROJECT_NAME}_VERSION_REVISION "0")
+SET(${PROJECT_NAME}_VERSION_AGE "0")
# Effective version number computation
MATH(EXPR ${PROJECT_NAME}_VERSION_MAJOR "${${PROJECT_NAME}_VERSION_CURRENT} - ${${PROJECT_NAME}_VERSION_AGE}")
@@ -52,10 +52,11 @@ if (CMAKE_INSTALL_PREFIX)
set (CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}" ${CMAKE_PREFIX_PATH})
endif (CMAKE_INSTALL_PREFIX)
-find_package (bpp-core 2.0.4 REQUIRED)
+include (GNUInstallDirs)
+find_package (bpp-core 3.0.0 REQUIRED)
# CMake package
-set (cmake-package-location lib/cmake/${PROJECT_NAME})
+set (cmake-package-location ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
include (CMakePackageConfigHelpers)
configure_package_config_file (
package.cmake.in
@@ -94,10 +95,10 @@ ENDIF(NO_DEP_CHECK)
# Packager
SET(CPACK_PACKAGE_NAME "libbpp-seq")
SET(CPACK_PACKAGE_VENDOR "Bio++ Development Team")
-SET(CPACK_PACKAGE_VERSION "2.3.0")
+SET(CPACK_PACKAGE_VERSION "2.3.1")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Bio++ Sequence library")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING.txt")
SET(CPACK_RESOURCE_FILE_AUTHORS "${CMAKE_SOURCE_DIR}/AUTHORS.txt")
diff --git a/bpp-seq.spec b/bpp-seq.spec
index 708c10e..e550f8a 100644
--- a/bpp-seq.spec
+++ b/bpp-seq.spec
@@ -1,5 +1,5 @@
%define _basename bpp-seq
-%define _version 2.3.0
+%define _version 2.3.1
%define _release 1
%define _prefix /usr
@@ -18,7 +18,7 @@ Requires: bpp-core = %{_version}
BuildRoot: %{_builddir}/%{_basename}-root
BuildRequires: cmake >= 2.8.11
BuildRequires: gcc-c++ >= 4.7.0
-BuildRequires: libbpp-core2 = %{_version}
+BuildRequires: libbpp-core3 = %{_version}
BuildRequires: libbpp-core-devel = %{_version}
AutoReq: yes
AutoProv: yes
@@ -27,19 +27,19 @@ AutoProv: yes
This library contains utilitary and classes for bio-sequence analysis.
It is part of the Bio++ project.
-%package -n libbpp-seq9
+%package -n libbpp-seq11
Summary: Bio++ Sequence library
Group: Development/Libraries/C and C++
-%description -n libbpp-seq9
+%description -n libbpp-seq11
This library contains utilitary and classes for bio-sequence analysis.
It is part of the Bio++ project.
%package -n libbpp-seq-devel
Summary: Libraries, includes to develop applications with %{_basename}
Group: Development/Libraries/C and C++
-Requires: libbpp-seq9 = %{_version}
-Requires: libbpp-core2 = %{_version}
+Requires: libbpp-seq11 = %{_version}
+Requires: libbpp-core3 = %{_version}
Requires: libbpp-core-devel = %{_version}
%description -n libbpp-seq-devel
@@ -52,9 +52,6 @@ building applications which use %{_basename}.
%build
CFLAGS="$RPM_OPT_FLAGS"
CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTING=OFF"
-if [ %{_lib} == 'lib64' ] ; then
- CMAKE_FLAGS="$CMAKE_FLAGS -DLIB_SUFFIX=64"
-fi
cmake $CMAKE_FLAGS .
make
@@ -64,11 +61,11 @@ make DESTDIR=$RPM_BUILD_ROOT install
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n libbpp-seq9 -p /sbin/ldconfig
+%post -n libbpp-seq11 -p /sbin/ldconfig
-%postun -n libbpp-seq9 -p /sbin/ldconfig
+%postun -n libbpp-seq11 -p /sbin/ldconfig
-%files -n libbpp-seq9
+%files -n libbpp-seq11
%defattr(-,root,root)
%doc AUTHORS.txt COPYING.txt INSTALL.txt ChangeLog
%{_prefix}/%{_lib}/lib*.so.*
@@ -76,14 +73,16 @@ rm -rf $RPM_BUILD_ROOT
%files -n libbpp-seq-devel
%defattr(-,root,root)
%doc AUTHORS.txt COPYING.txt INSTALL.txt ChangeLog
-%dir %{_prefix}/lib/cmake/
-%dir %{_prefix}/lib/cmake/bpp-seq
+%dir %{_prefix}/%{_lib}/cmake/
+%dir %{_prefix}/%{_lib}/cmake/bpp-seq
%{_prefix}/%{_lib}/lib*.so
%{_prefix}/%{_lib}/lib*.a
-%{_prefix}/lib/cmake/bpp-seq/bpp-seq*.cmake
+%{_prefix}/%{_lib}/cmake/bpp-seq/bpp-seq*.cmake
%{_prefix}/include/*
%changelog
+* Tue Jun 06 2017 Julien Dutheil <julien.dutheil at univ-montp2.fr> 2.3.1-1
+- Increased interface number
* Wed May 10 2017 Julien Dutheil <julien.dutheil at univ-montp2.fr> 2.3.0-1
- Several bugs fixed and performance improvements
- New framework for probabilistic sequences
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 910c1f3..187dc11 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,7 +100,7 @@ SET(CPP_FILES
add_library (${PROJECT_NAME}-static STATIC ${CPP_FILES})
target_include_directories (${PROJECT_NAME}-static PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
+ $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties (${PROJECT_NAME}-static PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
target_link_libraries (${PROJECT_NAME}-static ${BPP_LIBS_STATIC})
@@ -109,7 +109,7 @@ target_link_libraries (${PROJECT_NAME}-static ${BPP_LIBS_STATIC})
add_library (${PROJECT_NAME}-shared SHARED ${CPP_FILES})
target_include_directories (${PROJECT_NAME}-shared PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>
+ $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>
)
set_target_properties (${PROJECT_NAME}-shared
PROPERTIES OUTPUT_NAME ${PROJECT_NAME}
@@ -123,12 +123,13 @@ target_link_libraries (${PROJECT_NAME}-shared ${BPP_LIBS_SHARED})
install (
TARGETS ${PROJECT_NAME}-static ${PROJECT_NAME}-shared
EXPORT ${PROJECT_NAME}-targets
- LIBRARY DESTINATION lib${LIB_SUFFIX}
- ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
install (
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bpp
- DESTINATION include
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING PATTERN "*.h"
)
# Install cmake file representing targets
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-seq.git
More information about the debian-med-commit
mailing list