Skip to content

Commit 924dc70

Browse files
author
Chris Johnson
committed
Fixed source path.
1 parent ac69fd5 commit 924dc70

2 files changed

Lines changed: 41 additions & 6 deletions

File tree

rpm/specfiles/simengine-core.spec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Summary: SimEngine - Core
55
URL: https://github.com/Seneca-CDOT/simengine
66
License: GPLv3+
77

8-
%global gittag v0.1-beta
8+
%global gittag 1
99

10-
Source0: https://github.com/Seneca-CDOT/simengine/archive/{gittag}/simengine-0.1-beta.tar.gz
10+
Source0: https://github.com/Seneca-CDOT/simengine/archive/%{gittag}/simengine-%{version}.tar.gz
1111

1212
BuildRequires: OpenIPMI-devel, gcc
1313
Requires: simengine-database, python3-libvirt, OpenIPMI, OpenIPMI-lanserv, python3-redis, python2-redis, python3-pysnmp, python3-neo4j-driver
@@ -21,10 +21,10 @@ Core files for SimEngine.
2121
pip3 install circuits
2222

2323
%prep
24-
%autosetup -n simengine-0.1-beta
24+
%autosetup -n simengine-%{version}
2525

2626
%build
27-
gcc -shared -o %{_builddir}/simengine-0.1-beta/haos_extend.so -fPIC %{_builddir}/simengine-0.1-beta/enginecore/ipmi_sim/haos_extend.c
27+
gcc -shared -o %{_builddir}/simengine-%{version}/haos_extend.so -fPIC %{_builddir}/simengine-%{version}/enginecore/ipmi_sim/haos_extend.c
2828

2929
%install
3030
mkdir -p %{buildroot}%{_datadir}/simengine/

rpm/specfiles/simengine-node.spec

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,37 @@ Summary: SimEngine - Dashboard
55
URL: https://github.com/Seneca-CDOT/simengine
66
License: GPLv3+
77

8-
Source0: %{name}-%{version}.tar.gz
8+
%global gittag 1
9+
10+
Source0: https://github.com/Seneca-CDOT/simengine/archive/{gittag}/simengine-%{version}.tar.gz
11+
Source1: http://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz
12+
Source2: http://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz
13+
Source3: http://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.3.tgz
14+
Source4: http://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz
15+
Source5: http://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz
16+
Source6: http://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz
17+
Source7: http://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.24.1.tgz
18+
Source8: http://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz
19+
Source9: http://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz
20+
Source10: http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz
21+
Source11: http://registry.npmjs.org/eslint-loader/-/eslint-loader-2.0.0.tgz
22+
Source12: http://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.12.0.tgz
23+
Source13: http://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz
24+
Source14: http://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-4.0.0-beta.0.tgz
25+
Source15: http://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz
26+
Source16: http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz
27+
Source17: http://registry.npmjs.org/live-server/-/live-server-1.2.0.tgz
28+
Source18: http://registry.npmjs.org/node-sass/-/node-sass-4.9.0.tgz
29+
Source19: http://registry.npmjs.org/sass-loader/-/sass-loader-7.0.1.tgz
30+
Source20: http://registry.npmjs.org/style-loader/-/style-loader-0.21.0.tgz
31+
Source21: http://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz
32+
Source22: http://registry.npmjs.org/url-loader/-/url-loader-1.0.1.tgz
33+
Source23: http://registry.npmjs.org/webpack/-/webpack-4.9.1.tgz
34+
Source24: http://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz
35+
Source25: http://registry.npmjs.org/webpack-cli/-/webpack-cli-2.1.4.tgz
36+
Source26: http://registry.npmjs.org/webpack-dashboard/-/webpack-dashboard-2.0.0.tgz
37+
Source27: http://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.4.tgz
38+
Source28: http://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz
939

1040
Requires: simengine-database, simengine-core, httpd
1141
BuildRequires: nodejs-packaging
@@ -16,7 +46,7 @@ Dashboard front-end website files for SimEngine.
1646
%global debug_package %{nil}
1747

1848
%prep
19-
%autosetup -c %{name}
49+
%autosetup -n simengine-%{version}
2050

2151
%build
2252
npm build:prod %{_builddir}/%{name}-%{version}/dashboard/frontend/
@@ -25,12 +55,17 @@ npm build:prod %{_builddir}/%{name}-%{version}/dashboard/frontend/
2555
mkdir -p %{buildroot}%{_localstatedir}/www/html/
2656
cp -fRp dashboard/frontend/public/images %{buildroot}%{_localstatedir}/www/html/
2757

58+
%{nodejs_sitelib}/<npm module name>
59+
2860
%files
2961
%{_localstatedir}/www/html/*
3062

3163
%post
3264
systemctl enable httpd.service --now
3365

3466
%changelog
67+
* Fri Aug 24 2018 Chris Johnson <chris.johnson@senecacollege.ca>
68+
- Modified Source0 to GitHub location
69+
3570
* Thu Aug 16 2018 Chris Johnson <chris.johnson@senecacollege.ca>
3671
- Initial alpha test file

0 commit comments

Comments
 (0)