diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-06-01 08:22:48 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-06-01 16:47:10 +0200 |
| commit | 0c5754a39f0bdd4c5390ea256f8d413fc94aaaba (patch) | |
| tree | 77a1549c024bd43e546ec02ce90def47c15dff13 /scripts | |
| parent | 0984d8a114b326a75b2c32cd9da2b7dee23920bb (diff) | |
| download | pki-0c5754a39f0bdd4c5390ea256f8d413fc94aaaba.tar.gz pki-0c5754a39f0bdd4c5390ea256f8d413fc94aaaba.tar.xz pki-0c5754a39f0bdd4c5390ea256f8d413fc94aaaba.zip | |
Removed hard-coded version numbers from compose scripts.
The compose scripts have been modified to use the version numbers
defined in the spec files.
https://pagure.io/dogtagpki/issue/2687
Change-Id: I9651e6239c34e38924fac1a3e7a1a1e6ad574b10
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/compose_dogtag_pki_theme_packages | 4 | ||||
| -rwxr-xr-x | scripts/compose_pki_console_packages | 4 | ||||
| -rwxr-xr-x | scripts/compose_pki_core_packages | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages index a3c7df840..1d4f9b5ee 100755 --- a/scripts/compose_dogtag_pki_theme_packages +++ b/scripts/compose_dogtag_pki_theme_packages @@ -31,14 +31,14 @@ PKI_PWD=`pwd` ## DOGTAG_PKI_THEME="dogtag-pki-theme" -DOGTAG_PKI_THEME_VERSION="10.4.6" +PKI_SPECS_FILE="${PKI_DIR}/specs/${DOGTAG_PKI_THEME}.spec" +DOGTAG_PKI_THEME_VERSION="`rpmspec -P "${PKI_SPECS_FILE}" | grep '^Version:' | awk '{print $2;}'`" ## ## Establish the SOURCE files/directories of the 'dogtag-pki' source directory ## -PKI_SPECS_FILE="${PKI_DIR}/specs/${DOGTAG_PKI_THEME}.spec" PKI_COMPONENT_LIST="common-ui console-ui" diff --git a/scripts/compose_pki_console_packages b/scripts/compose_pki_console_packages index 5618c13b1..52de22a0b 100755 --- a/scripts/compose_pki_console_packages +++ b/scripts/compose_pki_console_packages @@ -31,14 +31,14 @@ PKI_PWD=`pwd` ## PKI_CONSOLE="pki-console" -PKI_CONSOLE_VERSION="10.4.6" +PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CONSOLE}.spec" +PKI_CONSOLE_VERSION="`rpmspec -P "${PKI_SPECS_FILE}" | grep '^Version:' | awk '{print $2;}'`" ## ## Establish the SOURCE files/directories of the 'pki-console' source directory ## -PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CONSOLE}.spec" PKI_COMPONENT_LIST="test console" diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages index 08b3f79b5..c823e89f6 100755 --- a/scripts/compose_pki_core_packages +++ b/scripts/compose_pki_core_packages @@ -30,14 +30,14 @@ PKI_PWD=`pwd` ## PKI_CORE="pki-core" -PKI_CORE_VERSION="10.4.6" +PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CORE}.spec" +PKI_CORE_VERSION="`rpmspec -P "${PKI_SPECS_FILE}" | grep '^Version:' | awk '{print $2;}'`" ## ## Establish the SOURCE files/directories of the 'pki-core' source directory ## -PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_CORE}.spec" PKI_COMPONENT_LIST="test symkey util common native-tools java-tools" if [ "$WITHOUT_JAVADOC" = "" ]; then |