Change-Id: I637c514d7e3ad59d279fae1d9cc4fecfe261efa4
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6304
Reviewed-by: Sharath George
Tested-by: Sharath George
... | ... |
@@ -4,7 +4,7 @@ |
4 | 4 |
Summary: EdgeX Foundry Go Services |
5 | 5 |
Name: edgex |
6 | 6 |
Version: 0.6.0 |
7 |
-Release: 1%{?dist} |
|
7 |
+Release: 2%{?dist} |
|
8 | 8 |
License: Apache-2.0 |
9 | 9 |
URL: https://github.com/edgexfoundry/edgex-go |
10 | 10 |
Group: Applications/System |
... | ... |
@@ -33,7 +33,6 @@ BuildRequires: make |
33 | 33 |
BuildRequires: systemd-devel |
34 | 34 |
BuildRequires: zeromq-devel |
35 | 35 |
Requires: systemd |
36 |
-Requires: mongodb |
|
37 | 36 |
Requires: consul |
38 | 37 |
|
39 | 38 |
%description |
... | ... |
@@ -93,5 +92,7 @@ install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/%{name}/scripts/`basename %{ |
93 | 93 |
%{_var}/log/* |
94 | 94 |
|
95 | 95 |
%changelog |
96 |
+* Wed Dec 05 2018 Alexey Makhalov <amakhalov@vmware.com> 0.6.0-2 |
|
97 |
+- Remove 'Requires: mongodb'. But edgex still depends on mongo. |
|
96 | 98 |
* Fri Jul 06 2018 Alexey Makhalov <amakhalov@vmware.com> 0.6.0-1 |
97 | 99 |
- Initial version |
98 | 100 |
deleted file mode 100644 |
... | ... |
@@ -1,86 +0,0 @@ |
1 |
-Name: mongodb |
|
2 |
-Version: 3.4.10 |
|
3 |
-Release: 1%{?dist} |
|
4 |
-Summary: The MongoDB Database |
|
5 |
-Group: Applications/Database |
|
6 |
-License: AGPLv3 |
|
7 |
-URL: http://www.mongodb.org/ |
|
8 |
-Source0: https://github.com/mongodb/mongo/archive/mongo-r%{version}.tar.gz |
|
9 |
-%define sha1 mongo-r=39b1e86c650a7b1b3ccc1dee86d088fc95a0a225 |
|
10 |
-Vendor: VMware, Inc. |
|
11 |
-Distribution: Photon |
|
12 |
-BuildRequires: scons |
|
13 |
-BuildRequires: systemd |
|
14 |
- |
|
15 |
-%description |
|
16 |
-MongoDB (from "humongous") is a scalable, high-performance, open source, document-oriented database. |
|
17 |
- |
|
18 |
-%prep |
|
19 |
-%setup -qn mongo-r%{version} |
|
20 |
- |
|
21 |
-%build |
|
22 |
-%ifarch x86_64 |
|
23 |
-scons %{?_smp_mflags} MONGO_VERSION=%{version} \ |
|
24 |
- --disable-warnings-as-errors |
|
25 |
-%endif |
|
26 |
- |
|
27 |
-%ifarch aarch64 |
|
28 |
-scons %{?_smp_mflags} MONGO_VERSION=%{version} CCFLAGS="-march=armv8-a+crc" \ |
|
29 |
- --disable-warnings-as-errors |
|
30 |
-%endif |
|
31 |
- |
|
32 |
- |
|
33 |
- |
|
34 |
-%install |
|
35 |
-%ifarch x86_64 |
|
36 |
-scons %{?_smp_mflags} MONGO_VERSION=%{version} install \ |
|
37 |
- --prefix=%{buildroot}%{_prefix} \ |
|
38 |
- --disable-warnings-as-errors |
|
39 |
-%endif |
|
40 |
- |
|
41 |
-%ifarch aarch64 |
|
42 |
-scons %{?_smp_mflags} MONGO_VERSION=%{version} CCFLAGS="-march=armv8-a+crc" install \ |
|
43 |
- --prefix=%{buildroot}%{_prefix} \ |
|
44 |
- --disable-warnings-as-errors |
|
45 |
-%endif |
|
46 |
- |
|
47 |
-install -d %{buildroot}/var/log/%{name} |
|
48 |
-install -d %{buildroot}/var/lib/mongo |
|
49 |
-install -d -m 755 %{buildroot}%{_unitdir} |
|
50 |
-install -D -m 644 rpm/mongod.service %{buildroot}%{_unitdir} |
|
51 |
-install -D -m 644 rpm/mongod.conf %{buildroot}/etc/mongod.conf |
|
52 |
- |
|
53 |
- |
|
54 |
-%clean |
|
55 |
-rm -rf %{buildroot} |
|
56 |
- |
|
57 |
-# Pre-install |
|
58 |
-%pre |
|
59 |
-if ! getent group mongod >/dev/null; then |
|
60 |
- /sbin/groupadd -r mongod |
|
61 |
-fi |
|
62 |
-if ! getent passwd mongod >/dev/null; then |
|
63 |
- /sbin/useradd -g mongod mongod -s /sbin/nologin |
|
64 |
-fi |
|
65 |
- |
|
66 |
-%preun |
|
67 |
- %systemd_preun mongod.service |
|
68 |
- |
|
69 |
-%postun |
|
70 |
- %systemd_postun_with_restart mongod.service |
|
71 |
- |
|
72 |
-%post |
|
73 |
- %systemd_post mongod.service |
|
74 |
- |
|
75 |
- |
|
76 |
-%files |
|
77 |
-%defattr(-,root,root,-) |
|
78 |
-%{_bindir}/* |
|
79 |
-%{_unitdir}/mongod.service |
|
80 |
-%config(noreplace) %attr(0644, mongod, mongod) %{_sysconfdir}/mongod.conf |
|
81 |
-%attr(0766, mongod, mongod) %dir /var/log/%{name} |
|
82 |
-%attr(0766, mongod, mongod) %dir /var/lib/mongo |
|
83 |
- |
|
84 |
-%changelog |
|
85 |
-* Fri Mar 16 2018 Dheeraj Shetty <dheerajs@vmware.com> 3.4.10-1 |
|
86 |
-- Initial build. First version |