Changed building behavior so that package version is always present.

When git repo is unavailable,
version from source is taken in order to create name.

Change-Id: Ifb4998eaafc7f2f85f488378a919f0734eb15939

diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
index 1bf0230088768cb8d053883c3fda8b319414782e..db40e8471a2259b47d13813c28e4eb64a5973ffa 100644 (file)
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
@@ -79,7 +79,7 @@ function(git_describe _var)
        endif()
        get_git_head_revision(refspec hash)
        if(NOT GIT_FOUND)
-               set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+               set(${_var} "_GIT_NOTFOUND" PARENT_SCOPE)
                return()
        endif()
        if(NOT hash)

diff --git a/packaging/bcc-tools.spec b/packaging/bcc-tools.spec
index a8fddf523dfec9d0e65da936da3259aa7a40584b..fa67587c6c9d54293f6b3fd5483296eb9d13a68b 100644 (file)
--- a/packaging/bcc-tools.spec
+++ b/packaging/bcc-tools.spec
@@ -53,9 +53,8 @@ This package provides example codes and documents.
 %setup -q -n bcc-tools-%{version}
 
 %build
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_CPP_EXAMPLES=ON .
-
+#DREVISION - number which will be put at back of the package name if repo isn't available
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DINSTALL_CPP_EXAMPLES=ON -DREVISION="%{version}" .
 make %{?jobs:-j%jobs}
 
 %install