Skip to content

Commit d9c0180

Browse files
Remove more dependencies from origin.spec
1 parent 861a92a commit d9c0180

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

origin.spec

+1-13
Original file line numberDiff line numberDiff line change
@@ -135,16 +135,9 @@ Summary: %{product_name} Test Suite
135135

136136
%package node
137137
Summary: %{product_name} Node
138-
Requires: %{name} = %{version}-%{release}
139138
Requires: %{name}-hyperkube = %{version}-%{release}
140-
Requires: docker >= %{docker_version}
141139
Requires: util-linux
142140
Requires: socat
143-
Requires: nfs-utils
144-
Requires: cifs-utils
145-
Requires: ethtool
146-
Requires: device-mapper-persistent-data >= 0.6.2
147-
Requires: conntrack-tools
148141
Requires(post): systemd
149142
Requires(preun): systemd
150143
Requires(postun): systemd
@@ -187,6 +180,7 @@ Requires: bridge-utils
187180
Requires: ethtool
188181
Requires: procps-ng
189182
Requires: iproute
183+
Requires: conntrack-tools
190184
Obsoletes: openshift-sdn-ovs < %{package_refactor_version}
191185

192186
%description sdn-ovs
@@ -308,11 +302,6 @@ done
308302

309303
install -d -m 0755 %{buildroot}%{_sysconfdir}/origin/{master,node}
310304

311-
# different service for origin vs aos
312-
# install -m 0644 contrib/systemd/%{name}-node.service %{buildroot}%{_unitdir}/%{name}-node.service
313-
# same sysconfig files for origin vs aos
314-
install -m 0644 contrib/systemd/origin-node.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/%{name}-node
315-
316305
# Install man1 man pages
317306
install -d -m 0755 %{buildroot}%{_mandir}/man1
318307
install -m 0644 docs/man/man1/* %{buildroot}%{_mandir}/man1/
@@ -394,7 +383,6 @@ touch --reference=%{SOURCE0} $RPM_BUILD_ROOT/usr/sbin/%{name}-docker-excluder
394383
%files node
395384
%{_bindir}/openshift-node-config
396385
%{_sysconfdir}/systemd/system.conf.d/origin-accounting.conf
397-
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-node
398386
%defattr(-,root,root,0700)
399387
%config(noreplace) %{_sysconfdir}/origin/node
400388

0 commit comments

Comments
 (0)