Request 1593 (accepted)

Overview

Request 1593 (accepted)

Add patch to allow OBS_VERSION to be set.

Created by boombatower over 9 years ago
In state accepted
Package maintainers: boombatower and frispete

Submit obs-studio-update

Submit package home:boomb...Multimedia / obs-studio-update to package Multimedia / obs-studio

obs-studio.spec Changed

obs-studio-allow-OBS_VERSION-to-be-set.patch Added

@@ -0,0 +1,45 @@
+From 0245e3b43ed3c48871522cd7720b78673415ddb8 Mon Sep 17 00:00:00 2001
+From: Jimmy Berry <jimmy@boombatower.com>
+Date: Fri, 30 Jan 2015 14:04:54 -0600
+Subject: [PATCH] Allow OBS_VERSION to be set to assist in packaging.
+
+---
+ cmake/Modules/ObsCpack.cmake | 20 +++++++++++++-------
+ 1 file changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/Modules/ObsCpack.cmake b/cmake/Modules/ObsCpack.cmake
+index cb5e85a..6de6019 100644
+--- a/cmake/Modules/ObsCpack.cmake
++++ b/cmake/Modules/ObsCpack.cmake
+@@ -14,15 +14,21 @@ set(CPACK_PACKAGE_VERSION_MINOR "0")
+ set(CPACK_PACKAGE_VERSION_PATCH "1")
+ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ 
+-if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+-	execute_process(COMMAND git describe --always --tags --dirty=-modified
+-		OUTPUT_VARIABLE OBS_VERSION
+-		WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+-		OUTPUT_STRIP_TRAILING_WHITESPACE)
+-else()
+-	set(OBS_VERSION "${CPACK_PACKAGE_VERSION}")
++if(NOT DEFINED OBS_VERSION)
++	if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
++		execute_process(COMMAND git describe --always --tags --dirty=-modified
++			OUTPUT_VARIABLE OBS_VERSION
++			WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
++			OUTPUT_STRIP_TRAILING_WHITESPACE)
++	endif()
++
++	# Fallback to static version when git is either not available or fails.
++	if("${OBS_VERSION}" STREQUAL "")
++		set(OBS_VERSION "${CPACK_PACKAGE_VERSION}")
++	endif()
+ endif()
+ 
++MESSAGE(STATUS "OBS_VERSION: ${OBS_VERSION}")
+ 
+ if(INSTALLER_RUN)
+ 	set(CPACK_PACKAGE_EXECUTABLES
+-- 
+2.1.4
+

Build Results
RPM Lint

Refresh

Comments for request 1593 0

Request History

boombatower created request over 9 years ago

Add patch to allow OBS_VERSION to be set.

boombatower accepted request over 9 years ago