Skip to content

Commit 3ee26dc

Browse files
ssheditapakund
authored andcommitted
cri-tools: fix spec
Change-Id: I5dcb4709514bee74cb281e5f08df58b0d5244098 Signed-off-by: Shreenidhi Shedi <[email protected]> Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/15976 Tested-by: gerrit-photon <[email protected]> Reviewed-by: Tapas Kundu <[email protected]>
1 parent 3b90246 commit 3ee26dc

File tree

1 file changed

+31
-48
lines changed

1 file changed

+31
-48
lines changed

SPECS/cri-tools/cri-tools.spec

Lines changed: 31 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
Summary: CRI tools
44
Name: cri-tools
55
Version: 1.21.0
6-
Release: 2%{?dist}
6+
Release: 3%{?dist}
77
License: Apache License Version 2.0
88
URL: https://github.com/kubernetes-incubator/cri-tools/archive/%{name}-%{version}.tar.gz
9-
Source0: %{name}-%{version}.tar.gz
10-
%define sha1 %{name}-%{version}.tar.gz=ebc09c9effed6534ff2a48054f35fd16b7e3a526
119
Group: Development/Tools
1210
Vendor: VMware, Inc.
1311
Distribution: Photon
12+
13+
Source0: %{name}-%{version}.tar.gz
14+
%define sha512 %{name}-%{version}.tar.gz=a307f5526fb8b7b23a1635b168a8f3b9b9b4bd6ccb94d461dc5af2065e6d1be527dadcb1c86e04808b244d0851a4901ee78a0263f58cf673f6ca503621d5eb61
15+
1416
BuildRequires: go
1517
BuildRequires: git
1618

@@ -20,59 +22,40 @@ crictl: CLI for kubelet CRI.
2022
critest: validation test suites for kubelet CRI.
2123

2224
%prep
23-
%setup -qn %{name}-%{version}
25+
%autosetup -Sgit -p1 -n %{name}-%{version}
2426

2527
%build
26-
make %{?_smp_mflags}
2728

2829
%install
29-
rm -rf %{buildroot}
30-
mkdir -p %{buildroot}%{_datadir}/%{name}
31-
mkdir -p %{buildroot}/usr/bin
32-
mkdir -p %{buildroot}/usr/lib/.build-id
33-
mkdir -p %{buildroot}/usr/share/doc/cri-tools
34-
mkdir -p %{buildroot}/usr/share/licenses/cri-tools
35-
mkdir -p %{buildroot}/man/man1
30+
make install BUILD_BIN_PATH=%{buildroot}%{_bindir} BUILD_PATH=%{buildroot} %{?_smp_mflags}
31+
32+
%clean
33+
rm -rf %{buildroot}/*
3634

37-
make install DESTDIR=%{buildroot}
38-
cp build/bin/crictl %{buildroot}/usr/bin
39-
cp build/bin/critest %{buildroot}/usr/bin
40-
cp CHANGELOG.md %{buildroot}/usr/share/doc/cri-tools
41-
cp LICENSE %{buildroot}/usr/share/licenses/cri-tools
42-
cp CHANGELOG.md %{buildroot}/usr/share/doc/cri-tools
43-
cp CONTRIBUTING.md %{buildroot}/usr/share/doc/cri-tools
44-
cp OWNERS %{buildroot}/usr/share/doc/cri-tools
45-
cp README.md %{buildroot}/usr/share/doc/cri-tools
46-
cp code-of-conduct.md %{buildroot}/usr/share/doc/cri-tools
47-
cp docs/validation.md %{buildroot}/usr/share/doc/cri-tools
48-
cp docs/roadmap.md %{buildroot}/usr/share/doc/cri-tools
49-
rm %{buildroot}/usr/local/bin/crictl
50-
rm %{buildroot}/usr/local/bin/critest
35+
%check
36+
%if 0%{?with_check}
37+
make test-e2e %{?_smp_mflags}
38+
%endif
5139

5240
%files
5341
%defattr(-,root,root)
54-
%{_datadir}/%{name}
5542
%{_bindir}/crictl
56-
%{_bindir}/critest
57-
%{_datadir}/doc/*
58-
%{_datadir}/licenses/*
59-
/man/man1/
60-
61-
%clean
62-
rm -rf %{buildroot}/*
43+
%exclude %{_bindir}/critest
6344

6445
%changelog
65-
* Fri Jun 11 2021 Piyush Gupta <[email protected]> 1.21.0-2
66-
- Bump up version to compile with new go
67-
* Mon Apr 12 2021 Gerrit Photon <[email protected]> 1.21.0-1
68-
- Automatic Version Bump
69-
* Fri Feb 05 2021 Harinadh D <[email protected]> 1.19.0-3
70-
- Bump up version to compile with new go
71-
* Fri Jan 15 2021 Piyush Gupta<[email protected]> 1.19.0-2
72-
- Bump up version to compile with new go
73-
* Tue Sep 01 2020 Gerrit Photon <[email protected]> 1.19.0-1
74-
- Automatic Version Bump
75-
* Mon Jun 22 2020 Gerrit Photon <[email protected]> 1.18.0-1
76-
- Automatic Version Bump
77-
* Thu Jul 26 2018 Tapas Kundu <[email protected]> 1.11.1-1
78-
- Initial build added for Photon.
46+
* Fri May 06 2022 Shreenidhi Shedi <[email protected]> 1.21.0-3
47+
- Fix spec
48+
* Fri Jun 11 2021 Piyush Gupta <[email protected]> 1.21.0-2
49+
- Bump up version to compile with new go
50+
* Mon Apr 12 2021 Gerrit Photon <[email protected]> 1.21.0-1
51+
- Automatic Version Bump
52+
* Fri Feb 05 2021 Harinadh D <[email protected]> 1.19.0-3
53+
- Bump up version to compile with new go
54+
* Fri Jan 15 2021 Piyush Gupta<[email protected]> 1.19.0-2
55+
- Bump up version to compile with new go
56+
* Tue Sep 01 2020 Gerrit Photon <[email protected]> 1.19.0-1
57+
- Automatic Version Bump
58+
* Mon Jun 22 2020 Gerrit Photon <[email protected]> 1.18.0-1
59+
- Automatic Version Bump
60+
* Thu Jul 26 2018 Tapas Kundu <[email protected]> 1.11.1-1
61+
- Initial build added for Photon.

0 commit comments

Comments
 (0)