Skip to content

Commit

Permalink
change soversion control
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Zalevskiy <denis.zalevskiy@jolla.com>
  • Loading branch information
Denis Zalevskiy committed Sep 25, 2015
1 parent 327a08e commit c6c23bf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
8 changes: 5 additions & 3 deletions rpm/vault.spec
Expand Up @@ -28,14 +28,15 @@ Incremental backup/restore framework
%package -n libvault
Group: System/Libraries
Summary: Vault backup framework libraries
Provides: %{name} = %{version}-%{release}
Obsoletes: %{name} < %{version}-%{release}
%description -n libvault
%summary

%package qt5-declarative
Group: System/Libraries
Summary: Vault backup framework QML plugin
# declarative part is moved from vault to the separate package
Obsoletes: vault < 0.3.0
Requires: libvault = %{version}
%description qt5-declarative
%summary

Expand Down Expand Up @@ -74,9 +75,10 @@ install -D -p -m644 tools/vault-gc.service %{buildroot}%{_userunitdir}/vault-gc.
%clean
rm -rf $RPM_BUILD_ROOT

%define lib_so_version 0
%files -n libvault
%defattr(-,root,root,-)
%{_libdir}/libvault-*.so.0
%{_libdir}/libvault-*.so.%{lib_so_version}
%{_libdir}/libvault-*.so.%{version}

%files qt5-declarative
Expand Down
11 changes: 7 additions & 4 deletions src/CMakeLists.txt
@@ -1,5 +1,7 @@
pkg_check_modules(GITTIN gittin REQUIRED)

set(VAULT_SOVERSION 0)

include_directories(
${GITTIN_INCLUDE_DIRS}
)
Expand All @@ -18,7 +20,7 @@ target_link_libraries(vault-core
${GITTIN_LIBRARIES}
)
set_target_properties(vault-core PROPERTIES
SOVERSION 0
SOVERSION ${VAULT_SOVERSION}
VERSION ${VERSION}
)
install(TARGETS vault-core DESTINATION ${DST_LIB})
Expand All @@ -33,7 +35,8 @@ qt5_use_modules(vault-unit Core)
target_link_libraries(vault-unit
${COR_LIBRARIES}
${QTAROUND_LIBRARIES}
)
)
# TODO transform soversion to the x.x.x
set_target_properties(vault-unit PROPERTIES
SOVERSION 0
VERSION ${VERSION}
Expand All @@ -48,7 +51,7 @@ target_link_libraries(vault-transfer
vault-core
)
set_target_properties(vault-transfer PROPERTIES
SOVERSION 0
SOVERSION ${VAULT_SOVERSION}
VERSION ${VERSION}
)
install(TARGETS vault-transfer DESTINATION ${DST_LIB})
Expand All @@ -60,7 +63,7 @@ add_library(vault-sync
vault-util.cpp
)
set_target_properties(vault-sync PROPERTIES
SOVERSION 0
SOVERSION ${VAULT_SOVERSION}
VERSION ${VERSION}
)
qt5_use_modules(vault-sync Core)
Expand Down

0 comments on commit c6c23bf

Please sign in to comment.