Merge from develop

README.md

@@ -136,12 +136,12 @@ On most systems, CMake should find the libraries automatically. However, that do
         cmake .. -DCMAKE_C_FLAGS="-I/path/to/openssl/include"
 
 
-Creating .deb packages
-----------------------
+Creating .deb and .rpm packages
+-------------------------------
 
-There are additional requirements if you want to create .deb packages. They are:
+There are additional requirements if you want to create packages. They are:
  - CMake version >= 3.3
- - (optional) rpmbuild
+ - rpmbuild for creating .rpm package
 
  1. Clone repository
 

cpack/CMakeLists.txt

@@ -44,6 +44,8 @@ if(BUILDTYPE MATCHES RELEASE AND NOT BUILD_TESTING)
 
         set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.cryfs.org")
         set(CPACK_RPM_PACKAGE_LICENSE "LGPLv3")
+        set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
+        set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/bin;/usr/share/man;/usr/share/man/man1")
         set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debfiles/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debfiles/postrm")
 
         include(CPack)

src/cpp-utils/data/Data.cpp

@@ -39,7 +39,7 @@ std::streampos Data::_getStreamSize(istream &stream) {
 Data Data::LoadFromStream(istream &stream, size_t size) {
   Data result(size);
   stream.read(static_cast<char*>(result.data()), result.size());
-  return std::move(result);
+  return result;
 }
 
 }