From e1b97a2d24aefaa345c6606748b2c3aa216de178 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Mon, 24 Apr 2017 17:02:17 +0200
Subject: [PATCH 1/2] two ways to name snap packages?

---
 cmake/packages/snap.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/packages/snap.cmake b/cmake/packages/snap.cmake
index cb9720fd3d..30e7d41c4f 100644
--- a/cmake/packages/snap.cmake
+++ b/cmake/packages/snap.cmake
@@ -7,7 +7,6 @@ endif()
 if(SNAPCRAFT_FOUND)
   set(SNAPCRAFT_TEMPLATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Installation/Ubuntu")
   set(SNAPCRAFT_SOURCE_DIR "${CMAKE_BINARY_DIR}/_CPack_Packages/SNAP")
-  set(CPACK_SNAP_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_*${ARANGODB_PACKAGE_ARCHITECTURE}.snap")
 
   message(STATUS "Creating snap package")
 
@@ -31,7 +30,12 @@ if(SNAPCRAFT_FOUND)
   file(
     COPY        "${SNAPCRAFT_TEMPLATE_DIR}/arangodb.png"
     DESTINATION "${SNAPCRAFT_SOURCE_DIR}/"
-  )
+    )
+
+  set(CPACK_SNAP_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${ARANGODB_PACKAGE_ARCHITECTURE}.snap")
+  if(NOT EXISTS ${CPACK_SNAP_PACKAGE_FILE_NAME})
+    set(CPACK_SNAP_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${ARANGODB_PACKAGE_REVISION}_${ARANGODB_PACKAGE_ARCHITECTURE}.snap")
+  endif()
   add_custom_target(snap
     COMMENT "create snap-package"
     COMMAND ${SNAP_EXE} snap

From 34f04a56e23090f40d12e34eb9a14df3e9a1678c Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Mon, 24 Apr 2017 17:32:59 +0200
Subject: [PATCH 2/2] fix license / readme filenames

---
 cmake/InstallMacros.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/InstallMacros.cmake b/cmake/InstallMacros.cmake
index 3d374b6e0d..09a7d20ab4 100644
--- a/cmake/InstallMacros.cmake
+++ b/cmake/InstallMacros.cmake
@@ -74,9 +74,9 @@ macro (install_readme input output)
   if (MSVC)
     set(CRLFSTYLE "CRLF")
   endif ()
-  configure_file(${PROJECT_SOURCE_DIR}/${input} "${PROJECT_BINARY_DIR}/${input}" NEWLINE_STYLE ${CRLFSTYLE})
+  configure_file(${PROJECT_SOURCE_DIR}/${input} "${PROJECT_BINARY_DIR}/${output}" NEWLINE_STYLE ${CRLFSTYLE})
   install(
-    FILES "${PROJECT_BINARY_DIR}/${input}"
+    FILES "${PROJECT_BINARY_DIR}/${output}"
     DESTINATION "${where}"
     )
 endmacro ()