1. photon
  2. Commit f015cce15b1d212024eef0f8875e946e5fccbe6a
Browse code

toybox: clean up

- Added Conflicts: toybox to all alternative packages
- Removed usleep and strings to avoid conflict with initsctrips and binutils
- gcc: use parallel build

Change-Id: I7c6dbf60a7be80b85c9ade9cb81b2acd6fe63dab
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3927
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Bo Gan <ganb@vmware.com>

Alexey Makhalov authored on 2017/10/03 06:11:28
Showing 12 changed files
SPECS/coreutils/coreutils.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Basic system utilities
2 2 
 Name:		coreutils
3 3 
 Version:	8.27
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv3
6 6 
 URL:		http://www.gnu.org/software/coreutils
7 7 
 Group:		System Environment/Base
... ... 
@@ -13,6 +13,7 @@ Patch0:		http://www.linuxfromscratch.org/patches/downloads/coreutils/coreutils-8
13 13 
 Patch1:		http://www.linuxfromscratch.org/patches/downloads/coreutils/coreutils-8.27-uname-1.patch
14 14 
 Requires:	gmp
15 15 
 Provides:	sh-utils
16 
+Conflicts:      toybox
16 17 
 %description
17 18 
 The Coreutils package contains utilities for showing and setting
18 19 
 the basic system
... ... 
@@ -75,15 +76,17 @@ sudo -u nobody -s /bin/bash -c "PATH=$PATH make -k check"
75 75 
 %defattr(-,root,root)
76 76
77 77 
 %changelog
78 
-*       Wed Aug 09 2017 Rongrong Qiu <rqiu@vmware.com> 8.27-2
79 
--       Fix make check for bug 1900253
80 
-*       Thu Apr 06 2017 Anish Swaminathan <anishs@vmware.com> 8.27-1
81 
--       Upgraded to version 8.27
82 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.25-2
83 
--	GA - Bump release of all rpms
84 
-*	Tue May 17 2016 Divya Thaluru <dthaluru@vmware.com> 8.25-1
85 
-- 	Updated to version 8.25
86 
-* 	Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 8.24-1
87 
-- 	Updated to version 8.24
88 
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 8.22-1
89 
--	Initial build. First version
78 
+* Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 8.27-3
79 
+- Added conflicts toybox
80 
+* Wed Aug 09 2017 Rongrong Qiu <rqiu@vmware.com> 8.27-2
81 
+- Fix make check for bug 1900253
82 
+* Thu Apr 06 2017 Anish Swaminathan <anishs@vmware.com> 8.27-1
83 
+- Upgraded to version 8.27
84 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.25-2
85 
+- GA - Bump release of all rpms
86 
+* Tue May 17 2016 Divya Thaluru <dthaluru@vmware.com> 8.25-1
87 
+- Updated to version 8.25
88 
+* Tue Jan 12 2016 Xiaolin Li <xiaolinl@vmware.com> 8.24-1
89 
+- Updated to version 8.24
90 
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 8.22-1
91 
+- Initial build. First version
SPECS/cpio/cpio.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	cpio-2.12
2 2 
 Name:		cpio
3 3 
 Version:	2.12
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv3+
6 6 
 URL:		http://www.gnu.org/software/cpio/
7 7 
 Group:		System Environment/System utilities
... ... 
@@ -9,6 +9,7 @@ Vendor:		VMware, Inc.
9 9 
 Distribution: 	Photon
10 10 
 Source0:	http://ftp.gnu.org/pub/gnu/cpio/%{name}-%{version}.tar.bz2
11 11 
 %define sha1 cpio=60358408c76db354f6716724c4bcbcb6e18ab642
12 
+Conflicts:      toybox
12 13 
 %description
13 14 
 The cpio package contains tools for archiving.
14 15
... ... 
@@ -53,13 +54,15 @@ make %{?_smp_mflags} check
53 53 
 %defattr(-,root,root)
54 54
55 55 
 %changelog
56 
-*       Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 2.12-3
57 
--       Add lang package
58 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.12-2
59 
--	GA - Bump release of all rpms
60 
-* 	Thu Jan 14 2016 Xiaolin Li <xiaolinl@vmware.com> 2.12-1
61 
-- 	Updated to version 2.12
62 
-*	Fri Aug 14 2015 Divya Thaluru <dthaluru@vmware.com> 2.11-2
63 
--	Adding security patch for CVE-2014-9112
64 
-*	Tue Nov 04 2014 Divya Thaluru <dthaluru@vmware.com> 2.11-1
65 
--	Initial build. First version
56 
+* Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 2.12-4
57 
+- Added conflicts toybox
58 
+* Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 2.12-3
59 
+- Add lang package
60 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.12-2
61 
+- GA - Bump release of all rpms
62 
+* Thu Jan 14 2016 Xiaolin Li <xiaolinl@vmware.com> 2.12-1
63 
+- Updated to version 2.12
64 
+* Fri Aug 14 2015 Divya Thaluru <dthaluru@vmware.com> 2.11-2
65 
+- Adding security patch for CVE-2014-9112
66 
+* Tue Nov 04 2014 Divya Thaluru <dthaluru@vmware.com> 2.11-1
67 
+- Initial build. First version
SPECS/findutils/findutils.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	This package contains programs to find files
2 2 
 Name:		findutils
3 3 
 Version:	4.6.0
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv3+
6 6 
 URL:		http://www.gnu.org/software/findutils
7 7 
 Group:		Applications/File
... ... 
@@ -9,6 +9,7 @@ Vendor:		VMware, Inc.
9 9 
 Distribution: 	Photon
10 10 
 Source0:	http://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
11 11 
 %define sha1 findutils=f18e8aaee3f3d4173a1f598001003be8706d28b0
12 
+Conflicts:      toybox
12 13 
 %description
13 14 
 These programs are provided to recursively search through a
14 15 
 directory tree and to create, maintain, and search a database
... ... 
@@ -55,11 +56,13 @@ make %{?_smp_mflags} check
55 55 
 %defattr(-,root,root)
56 56
57 57 
 %changelog
58 
-*       Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 4.6.0-3
59 
--       Add lang package.
60 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.6.0-2
61 
--	GA - Bump release of all rpms
62 
-*   	Tue Apr 26 2016 Anish Swaminathan <anishs@vmware.com> 4.6.0-1
63 
--   	Updated to version 4.6.0
64 
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 4.4.2-1
65 
--	Initial build.	First version
58 
+* Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 4.6.0-4
59 
+- Added conflicts toybox
60 
+* Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 4.6.0-3
61 
+- Add lang package.
62 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.6.0-2
63 
+- GA - Bump release of all rpms
64 
+* Tue Apr 26 2016 Anish Swaminathan <anishs@vmware.com> 4.6.0-1
65 
+- Updated to version 4.6.0
66 
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 4.4.2-1
67 
+- Initial build. First version
SPECS/gcc/gcc.spec
History View file @ f015cce
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        Contains the GNU compiler collection
3 3 
 Name:           gcc
4 4 
 Version:        6.3.0
5 
-Release:        5%{?dist}
5 
+Release:        6%{?dist}
6 6 
 License:        GPLv2+
7 7 
 URL:            http://gcc.gnu.org
8 8 
 Group:          Development/Tools
... ... 
@@ -124,10 +124,10 @@ SED=sed \
124 124 
     --enable-plugin \
125 125 
     --with-system-zlib
126 126 
 #   --disable-silent-rules
127 
-make
127 
+make %{?_smp_mflags}
128 128 
 %install
129 129 
 pushd ../gcc-build
130 
-make DESTDIR=%{buildroot} install
130 
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
131 131 
 install -vdm 755 %{buildroot}/%_lib
132 132 
 ln -sv %{_bindir}/cpp %{buildroot}/%{_lib}
133 133 
 ln -sv gcc %{buildroot}%{_bindir}/cc
... ... 
@@ -267,6 +267,8 @@ make %{?_smp_mflags} check-gcc
267 267 
 %endif
268 268
269 269 
 %changelog
270 
+*   Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-6
271 
+-   Added smp_mflags for parallel build
270 272 
 *   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-5
271 273 
 -   Enable elfdeps for libgcc_s to generate libgcc_s.so.1(*)(64bit) provides
272 274 
 *   Mon Aug 28 2017 Alexey Makhalov <amakhalov@vmware.com> 6.3.0-4
SPECS/grep/grep.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Programs for searching through files
2 2 
 Name:		grep
3 3 
 Version:	3.0
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv3+
6 6 
 URL:		http://www.gnu.org/software/grep
7 7 
 Group:		Applications/File
... ... 
@@ -9,6 +9,7 @@ Vendor:		VMware, Inc.
9 9 
 Distribution: Photon
10 10 
 Source0:	http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
11 11 
 %define sha1 grep=7b742a6278f28ff056da799c62c1b9e417fe86ba
12 
+Conflicts:      toybox
12 13 
 %description
13 14 
 The Grep package contains programs for searching through files.
14 15
... ... 
@@ -48,17 +49,19 @@ make  %{?_smp_mflags} check
48 48 
 %defattr(-,root,root)
49 49
50 50 
 %changelog
51 
-*       Wed Aug 23 2017 Rongrong Qiu <rqiu@vmware.com> 3.0-3
52 
--       Disable grep -P for make check bug 1900287
53 
-*       Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 3.0-2
54 
--       Add lang package.
55 
-*       Fri Mar 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.0-1
56 
--       Upgrading grep to 3.0 version
57 
-*       Thu Oct 06 2016 ChangLee <changlee@vmware.com> 2.21-3
58 
--       Modified %check
59 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.21-2
60 
--	GA - Bump release of all rpms
61 
-*       Mon Apr 6 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 2.21-1
62 
--       Upgrading grep to 2.21 version, and adding
63 
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.16-1
64 
--	Initial build. First version
51 
+* Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 3.0-4
52 
+- Added conflicts toybox
53 
+* Wed Aug 23 2017 Rongrong Qiu <rqiu@vmware.com> 3.0-3
54 
+- Disable grep -P for make check bug 1900287
55 
+* Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 3.0-2
56 
+- Add lang package.
57 
+* Fri Mar 24 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.0-1
58 
+- Upgrading grep to 3.0 version
59 
+* Thu Oct 06 2016 ChangLee <changlee@vmware.com> 2.21-3
60 
+- Modified %check
61 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.21-2
62 
+- GA - Bump release of all rpms
63 
+* Mon Apr 6 2015 Mahmoud Bassiouny <mbassiouny@vmware.com> 2.21-1
64 
+- Upgrading grep to 2.21 version, and adding
65 
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 2.16-1
66 
+- Initial build. First version
SPECS/net-tools/net-tools.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Networking Tools
2 2 
 Name:		net-tools
3 3 
 Version:	1.60
4 
-Release:	10%{?dist}
4 
+Release:	11%{?dist}
5 5 
 License:	GPLv2+
6 6 
 URL:		http://net-tools.sourceforge.net
7 7 
 Group:		System Environment/Base
... ... 
@@ -41,6 +41,7 @@ Patch28:	Bug#561161-statistics.c-long_numbers.patch
41 41 
 Patch29:	Bug#508110-inet6.c-initialize_fields.patch
42 42 
 Patch30:	Ubuntu_unit_conversion.patch
43 43 
 Obsoletes:	inetutils
44 
+Conflicts:      toybox
44 45 
 %description
45 46 
 The Net-tools package is a collection of programs for controlling the network subsystem of the Linux kernel.
46 47 
 %prep
... ... 
@@ -104,6 +105,8 @@ rm -rf %{buildroot}/*
104 104 
 %{_mandir}/man8/*
105 105
106 106 
 %changelog
107 
+*   Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 1.60-11
108 
+-   Added conflicts toybox
107 109 
 *   Wed Dec 14 2016 Alexey Makhalov <amakhalov@vmware.com> 1.60-10
108 110 
 -   Fix compilation issue with linux-4.9
109 111 
 *   Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 1.60-9
SPECS/procps-ng/procps-ng.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Programs for monitoring processes
2 2 
 Name:           procps-ng
3 3 
 Version:        3.3.12
4 
-Release:        2%{?dist}
4 
+Release:        3%{?dist}
5 5 
 License:        GPLv2
6 6 
 URL:            http://procps.sourceforge.net/
7 7 
 Group:          Applications/System
... ... 
@@ -11,6 +11,7 @@ Source0:        http://sourceforge.net/projects/procps-ng/files/Production/%{nam
11 11 
 %define sha1    procps-ng=82c0745f150f1385ca01fe7d24f05f74e31c94c6
12 12 
 BuildRequires:  ncurses-devel
13 13 
 Requires:       ncurses
14 
+Conflicts:      toybox
14 15 
 %description
15 16 
 The Procps package contains programs for monitoring processes.
16 17 
 %package    devel
... ... 
@@ -98,6 +99,8 @@ make %{?_smp_mflags} check
98 98 
 %defattr(-,root,root)
99 99
100 100 
 %changelog
101 
+*   Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 3.3.12-3
102 
+-   Added conflicts toybox
101 103 
 *   Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 3.3.12-2
102 104 
 -   Add lang package.
103 105 
 *   Mon Apr 03 2017 Rongrong Qiu <rqiu@vmware.com> 3.3.12-1
SPECS/sed/sed.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Stream editor
2 2 
 Name:		sed
3 3 
 Version:	4.4
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	GPLv3
6 6 
 URL:		http://www.gnu.org/software/sed
7 7 
 Group:		Applications/Editors
... ... 
@@ -9,6 +9,7 @@ Vendor:		VMware, Inc.
9 9 
 Distribution:	Photon
10 10 
 Source0:	http://ftp.gnu.org/gnu/sed/%{name}-%{version}.tar.xz
11 11 
 %define sha1 sed=a196cd036efd52a8e349cfe88ab4baa555fb29d5
12 
+Conflicts:      toybox
12 13
13 14 
 %description
14 15 
 The Sed package contains a stream editor.
... ... 
@@ -50,13 +51,15 @@ make check
50 50 
 %defattr(-,root,root)
51 51
52 52 
 %changelog
53 
-*       Tue Aug 01 2017 Chang Lee <changlee@vmware.com> 4.4-2
54 
--       Skip panic-tests and subst-mb-incomplete from %check
55 
-*       Thu Apr 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 4.4-1
56 
--       Update to version 4.4
57 
-*       Wed Oct 05 2016 ChangLee <changlee@vmware.com> 4.2.2-3
58 
--       Modified %check
59 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.2-2
60 
--	GA - Bump release of all rpms
61 
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 4.2.2-1
62 
--	Initial build. First version
53 
+* Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4-3
54 
+- Added conflicts toybox
55 
+* Tue Aug 01 2017 Chang Lee <changlee@vmware.com> 4.4-2
56 
+- Skip panic-tests and subst-mb-incomplete from %check
57 
+* Thu Apr 13 2017 Vinay Kulkarni <kulkarniv@vmware.com> 4.4-1
58 
+- Update to version 4.4
59 
+* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 4.2.2-3
60 
+- Modified %check
61 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.2.2-2
62 
+- GA - Bump release of all rpms
63 
+* Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 4.2.2-1
64 
+- Initial build. First version
SPECS/toybox/config-0.7.3
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 #
2 2 
 # Automatically generated make config: don't edit
3 3 
 # ToyBox version: KCONFIG_VERSION
4 
-# Tue Sep 26 18:03:06 2017
4 
+# Mon Oct  2 13:59:43 2017
5 5 
 #
6 6 
 # CONFIG_TOYBOX_CONTAINER is not set
7 7 
 CONFIG_TOYBOX_FIFREEZE=y
... ... 
@@ -87,7 +87,7 @@ CONFIG_SORT=y
87 87 
 CONFIG_SORT_BIG=y
88 88 
 CONFIG_SORT_FLOAT=y
89 89 
 CONFIG_SPLIT=y
90 
-CONFIG_STRINGS=y
90 
+# CONFIG_STRINGS is not set
91 91 
 CONFIG_TAIL=y
92 92 
 CONFIG_TAIL_SEEK=y
93 93 
 CONFIG_TEE=y
... ... 
@@ -261,7 +261,7 @@ CONFIG_TASKSET=y
261 261 
 CONFIG_TIMEOUT=y
262 262 
 CONFIG_TRUNCATE=y
263 263 
 CONFIG_UPTIME=y
264 
-CONFIG_USLEEP=y
264 
+# CONFIG_USLEEP is not set
265 265 
 CONFIG_VCONFIG=y
266 266 
 CONFIG_VMSTAT=y
267 267 
 CONFIG_W=y
SPECS/toybox/toybox.spec
History View file @ f015cce
... ... 
@@ -1,6 +1,6 @@
1 1 
 Name:           toybox
2 2 
 Version:        0.7.3
3 
-Release:        5%{?dist}
3 
+Release:        6%{?dist}
4 4 
 License:        BSD
5 5 
 Summary:        Common Linux command line utilities in a single executable
6 6 
 Url:            http://landley.net/toybox/
... ... 
@@ -50,6 +50,8 @@ tests_to_run=`echo  $tests_to_run | sed -e 's/pkill//g'`
50 50 
 %{_sbindir}/*
51 51
52 52 
 %changelog
53 
+*   Mon Oct 01 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.3-6
54 
+-   remove strings and usleep to avoid conflict with binutils and initscripts
53 55 
 *   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.3-5
54 56 
 -   Move sed to /bin
55 57 
 -   Remove kmod and systemd toys due to incomplete
SPECS/util-linux/util-linux.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:        Utilities for file systems, consoles, partitions, and messages
2 2 
 Name:           util-linux
3 3 
 Version:        2.29.2
4 
-Release:        4%{?dist}
4 
+Release:        5%{?dist}
5 5 
 URL:            http://www.kernel.org/pub/linux/utils/util-linux
6 6 
 License:        GPLv2+
7 7 
 Group:          Applications/System
... ... 
@@ -14,6 +14,7 @@ BuildRequires:  ncurses-devel
14 14 
 BuildRequires:  ncurses-terminfo
15 15 
 %endif
16 16 
 Requires: %{name}-libs = %{version}-%{release}
17 
+Conflicts:      toybox
17 18 
 %description
18 19 
 Utilities for handling file systems, consoles, partitions,
19 20 
 and messages.
... ... 
@@ -96,6 +97,8 @@ rm -rf %{buildroot}/lib/systemd/system
96 96 
 %{_mandir}/man3/*
97 97
98 98 
 %changelog
99 
+*   Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 2.29.2-5
100 
+-   Added conflicts toybox
99 101 
 *   Fri Sep 15 2017 Bo Gan <ganb@vmware.com> 2.29.2-4
100 102 
 -   Cleanup check
101 103 
 *   Mon Jul 31 2017 Xiaolin Li <xiaolinl@vmware.com> 2.29.2-3
SPECS/which/which.spec
History View file @ f015cce
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Program shows full path of (shell) commands
2 2 
 Name:		which
3 3 
 Version:	2.21
4 
-Release:	3%{?dist}
4 
+Release:	4%{?dist}
5 5 
 License:	GPLv3+
6 6 
 URL:		http://savannah.gnu.org/projects/which
7 7 
 Source0:	http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
... ... 
@@ -9,6 +9,7 @@ Source0:	http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
9 9 
 Group:		Development/Tools
10 10 
 Vendor:		VMware, Inc.
11 11 
 Distribution: Photon
12 
+Conflicts:      toybox
12 13 
 %description
13 14 
 Program for showing the full the path of (shell) commands.
14 15 
 %prep
... ... 
@@ -25,11 +26,13 @@ make DESTDIR=%{buildroot} install
25 25 
 /usr/share/info/*
26 26 
 %{_mandir}/man1/*
27 27 
 %changelog
28 
-*       Mon Oct 10 2016 ChangLee <changlee@vmware.com> 2.21-3
29 
--       Modified %check
30 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.21-2
31 
--	GA - Bump release of all rpms
32 
-*	Wed Jan 20 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.21-1
33 
--	Update to 2.21-1.
34 
-*	Wed Oct 21 2014 Divya Thaluru <dthaluru@vmware.com> 2.20-1
35 
--	Initial build. First version
28 
+* Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 2.21-4
29 
+- Added conflicts toybox
30 
+* Mon Oct 10 2016 ChangLee <changlee@vmware.com> 2.21-3
31 
+- Modified %check
32 
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.21-2
33 
+- GA - Bump release of all rpms
34 
+* Wed Jan 20 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.21-1
35 
+- Update to 2.21-1.
36 
+* Wed Oct 21 2014 Divya Thaluru <dthaluru@vmware.com> 2.20-1
37 
+- Initial build. First version