Skip to content

Commit

Permalink
Fix PATH for build in Copr
Browse files Browse the repository at this point in the history
  • Loading branch information
mareklibra committed Nov 29, 2016
1 parent f3e9640 commit 9322f69
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ config.status
configure
install-sh
missing
ovirt-userportal.spec
ovirt-web-ui.spec
package.json
tmp.repos/

4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
3 changes: 2 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand All @@ -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
])


Expand Down
6 changes: 2 additions & 4 deletions ovirt-userportal.spec.in → ovirt-web-ui.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 9322f69

Please sign in to comment.