From f9feb2827aef8cef4b22a8cc3345c0c828f2e31d Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Tue, 11 Dec 2018 14:38:17 -0700 Subject: [PATCH] component.spec can now determine release version --- rpm/component.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rpm/component.spec b/rpm/component.spec index 9e1930a..7e25240 100644 --- a/rpm/component.spec +++ b/rpm/component.spec @@ -1,13 +1,13 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') %define _build_arch %(uname -i) +%define _python_awips_version %(grep ^ver /awips2/repo/python-awips/setup.py | cut -d '"' -f 2) %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - # # Python AWIPS Spec File # Name: awips2-python-awips Summary: Python AWIPS Distribution -Version: 18.1.6 +Version: %{_python_awips_version} Release: 1%{?dist} Group: AWIPSII BuildRoot: %{_build_root} @@ -67,10 +67,6 @@ fi cd %{_python_build_loc}/python-awips -## Apply patch -patch dynamicserialize/ThriftSerializationContext.py rpm/patch.diff -cat dynamicserialize/ThriftSerializationContext.py |grep long - pushd . > /dev/null /awips2/python/bin/python setup.py clean RC=$?