From 8da9887147d79c90869eb8f97a1bd2f3c99c455c Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 1 Apr 2018 21:26:50 +0200
Subject: [PATCH] Fix RPM buildFix RPM build..

---
 cmake/Rpm.cmake        | 9 +--------
 cmake/Version.cmake    | 1 +
 dist/maketarball.sh.in | 4 ----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/cmake/Rpm.cmake b/cmake/Rpm.cmake
index 711bb8753..4500be34a 100644
--- a/cmake/Rpm.cmake
+++ b/cmake/Rpm.cmake
@@ -8,12 +8,5 @@ add_custom_target(rpm
   COMMAND ${CMAKE_SOURCE_DIR}/dist/maketarball.sh
   COMMAND ${CMAKE_COMMAND} -E copy strawberry-${STRAWBERRY_VERSION_PACKAGE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
   COMMAND rpmbuild -bs ${CMAKE_SOURCE_DIR}/dist/strawberry.spec
-  COMMAND ${MOCK_COMMAND}
-      --verbose
-      --root=${MOCK_CHROOT}
-      --resultdir=${CMAKE_BINARY_DIR}/mock_result/
-      ${RPMBUILD_DIR}/SRPMS/strawberry-${STRAWBERRY_VERSION_RPM_V}-${STRAWBERRY_VERSION_RPM_R}.${RPM_DISTRO}.src.rpm
-  COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_BINARY_DIR}/mock_result/strawberry-${STRAWBERRY_VERSION_RPM_V}-${STRAWBERRY_VERSION_RPM_R}.${RPM_DISTRO}.${RPM_ARCH}.rpm
-      ${CMAKE_BINARY_DIR}/strawberry-${STRAWBERRY_VERSION_RPM_V}-${STRAWBERRY_VERSION_RPM_R}.${RPM_DISTRO}.${RPM_ARCH}.rpm
+  COMMAND rpmbuild -bb ${CMAKE_SOURCE_DIR}/dist/strawberry.spec
 )
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index b38efd2b4..3df3f01d3 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -3,6 +3,7 @@ set(STRAWBERRY_VERSION_MINOR 1)
 set(STRAWBERRY_VERSION_PATCH 1)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
+#set(INCLUDE_GIT_REVISION OFF)
 set(INCLUDE_GIT_REVISION ON)
 
 set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
diff --git a/dist/maketarball.sh.in b/dist/maketarball.sh.in
index 36e2525b2..975acd031 100755
--- a/dist/maketarball.sh.in
+++ b/dist/maketarball.sh.in
@@ -18,7 +18,3 @@ tar -cJf $name-$version.tar.xz \
     --exclude "$root/build" \
     --exclude ".directory" \
     "$root"
-
-if [ -d "$HOME/rpmbuild/SOURCES" ]; then
-  cp -v "$name-$version.tar.xz" "$HOME/rpmbuild/SOURCES"
-fi