From 9322f69846599d66de9ecb37676d6c241ed04e61 Mon Sep 17 00:00:00 2001 From: Marek Libra Date: Tue, 29 Nov 2016 10:24:32 +0100 Subject: [PATCH] Fix PATH for build in Copr --- .gitignore | 2 +- Makefile.am | 4 ++-- autogen.sh | 2 +- configure.ac | 3 ++- ovirt-userportal.spec.in => ovirt-web-ui.spec.in | 6 ++---- 5 files changed, 8 insertions(+), 9 deletions(-) rename ovirt-userportal.spec.in => ovirt-web-ui.spec.in (98%) diff --git a/.gitignore b/.gitignore index 0ca11418c..7e6627a41 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ config.status configure install-sh missing -ovirt-userportal.spec +ovirt-web-ui.spec package.json tmp.repos/ diff --git a/Makefile.am b/Makefile.am index f7693c797..09f4e6d1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ export PATH := /usr/share/ovirt-engine-nodejs/bin:../node_modules/.bin:$(PATH) EXTRA_DIST = \ autogen.sh \ - ovirt-userportal.spec \ - ovirt-userportal.spec.in \ + ovirt-web-ui.spec \ + ovirt-web-ui.spec.in \ README.md \ LICENSE \ src \ diff --git a/autogen.sh b/autogen.sh index 9bc8b457b..2ffcebc3b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -40,7 +40,7 @@ THEDIR=`pwd` test $die = 1 && exit 1 - test -f ovirt-userportal.spec.in || { + test -f ovirt-web-ui.spec.in || { echo "You must run this script in the top-level directory" exit 1 } diff --git a/configure.ac b/configure.ac index 7dbbf3de4..6e5445e32 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax]) AC_ARG_VAR([RPMBUILD], [path to rpmbuild utility]) AC_CHECK_PROGS([RPMBUILD], [rpmbuild]) +echo ${PATH} AC_ARG_VAR([NPM], [path to npm utility]) AC_CHECK_PROGS([NPM], [npm]) @@ -41,7 +42,7 @@ test -z "${NPM}" && AC_MSG_ERROR([NodeJS npm program not found]) AC_CONFIG_FILES([ Makefile package.json - ovirt-userportal.spec + ovirt-web-ui.spec ]) diff --git a/ovirt-userportal.spec.in b/ovirt-web-ui.spec.in similarity index 98% rename from ovirt-userportal.spec.in rename to ovirt-web-ui.spec.in index 17407ca37..be7333068 100644 --- a/ovirt-userportal.spec.in +++ b/ovirt-web-ui.spec.in @@ -38,17 +38,15 @@ BuildRequires: ovirt-engine-nodejs-modules = 0.0.16 This package provides new User Portal for %{product}, so far as technical preview. %prep -%setup -q -n"%{source_basename}-%{version}" - # Use the ovirt-engine nodejs installation export PATH="%{_datadir}/ovirt-engine-nodejs/bin:${PATH}" - +%setup -q -n"%{source_basename}-%{version}" # Copy the Node.js dependencies to the local "node_modules" directory ln -s "%{_sharedstatedir}/ovirt-engine-nodejs-modules/node_modules" %build +export PATH="%{_datadir}/ovirt-engine-nodejs/bin:${PATH}" %configure - export PATH="./node_modules/.bin:${PATH}" make