1. photon
  2. Commit ca774cb65fc0651d4efe4df05eb1a0de76e641ad
Browse code

Updated tcsh, texinfo, thin-provisioning-tool, tmux, traceroute.

Change-Id: If6f732f47c9fa22bcbb9995356d2744dfaa7e711
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2190
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

xiaolin-vmware authored on 2017/03/29 03:42:09
Showing 5 changed files
SPECS/tcsh/tcsh.spec
History View file @ ca774cb
... ... 
@@ -1,21 +1,21 @@
1 1 
 # Got the intial spec from Fedora and modified it
2 
-Summary:	An enhanced version of csh, the C shell
3 
-Name:		tcsh
4 
-Version:	6.19.00
5 
-Release:	6%{?dist}
6 
-License:	BSD
7 
-Group:		System Environment/Shells
8 
-Source:		http://www.sfr-fresh.com/unix/misc/%{name}-%{version}.tar.gz
9 
-%define sha1 tcsh=cdb1abe319fab5d3caff101c393293e5b3607f0c
2 
+Summary:        An enhanced version of csh, the C shell
3 
+Name:           tcsh
4 
+Version:        6.20.00
5 
+Release:        1%{?dist}
6 
+License:        BSD
7 
+Group:          System Environment/Shells
8 
+Source:         http://www.sfr-fresh.com/unix/misc/%{name}-%{version}.tar.xz
9 
+%define sha1    tcsh=a52deb0181e32583dbe666474c9c2e784357feba
10 10 
 Patch0:         tcsh-6.19.00-calloc-gcc-5.patch
11 11 
 Patch1:         tcsh.glibc-2.24.patch
12 
-URL:		http://www.tcsh.org/
13 
-Vendor:		VMware, Inc.
14 
-Distribution: 	Photon
15 
-Provides:	csh = %{version}
16 
-Provides:	/bin/tcsh, /bin/csh
17 
-BuildRequires:	ncurses-devel
18 
-Requires:	ncurses
12 
+URL:            http://www.tcsh.org/
13 
+Vendor:         VMware, Inc.
14 
+Distribution:   Photon
15 
+Provides:       csh = %{version}
16 
+Provides:       /bin/tcsh, /bin/csh
17 
+BuildRequires:  ncurses-devel
18 
+Requires:       ncurses
19 19 
 Requires(post): grep
20 20 
 Requires(postun): coreutils, grep
21 21
... ... 
@@ -29,8 +29,6 @@ like syntax.
29 29
30 30 
 %prep
31 31 
 %setup -q
32 
-%patch0 -p1
33 
-%patch1 -p1
34 32
35 33 
 %build
36 34 
 sed -i -e 's|\$\*|#&|' -e 's|fR/g|&m|' tcsh.man2html &&
... ... 
@@ -47,12 +45,12 @@ ln -sf tcsh %{buildroot}%{_bindir}/csh
47 47 
 ln -sf tcsh.1 %{buildroot}%{_mandir}/man1/csh.1
48 48
49 49 
 while read lang language ; do
50 
-	dest=%{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
51 
-	if test -f tcsh.$language.cat ; then
52 
-		mkdir -p $dest
53 
-		install -p -m 644 tcsh.$language.cat $dest/tcsh
54 
-		echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh"
55 
-	fi
50 
+  dest=%{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
51 
+  if test -f tcsh.$language.cat ; then
52 
+    mkdir -p $dest
53 
+    install -p -m 644 tcsh.$language.cat $dest/tcsh
54 
+    echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh"
55 
+  fi
56 56 
 done > tcsh.lang << _EOF
57 57 
 de german
58 58 
 el greek
... ... 
@@ -78,18 +76,18 @@ rm -rf %{buildroot}
78 78 
 if [ $1 -eq 1 ] ; then
79 79 
   if [ ! -f /etc/shells ]; then
80 80 
    echo "%{_bindir}/tcsh" >> /etc/shells
81 
-   echo "%{_bindir}/csh"	>> /etc/shells
81 
+   echo "%{_bindir}/csh"  >> /etc/shells
82 82 
    echo "/bin/tcsh" >> /etc/shells
83 
-   echo "/bin/csh"	>> /etc/shells
83 
+   echo "/bin/csh"  >> /etc/shells
84 84 
   else
85 85 
    grep -q '^%{_bindir}/tcsh$' /etc/shells || \
86 86 
    echo "%{_bindir}/tcsh" >> /etc/shells
87 87 
    grep -q '^%{_bindir}/csh$'  /etc/shells || \
88 
-   echo "%{_bindir}/csh"	>> /etc/shells
88 
+   echo "%{_bindir}/csh"  >> /etc/shells
89 89 
    grep -q '^/bin/tcsh$' /etc/shells || \
90 90 
    echo "/bin/tcsh" >> /etc/shells
91 91 
    grep -q '^/bin/csh$'  /etc/shells || \
92 
-   echo "/bin/csh"	>> /etc/shells
92 
+   echo "/bin/csh"  >> /etc/shells
93 93 
   fi
94 94 
 fi
95 95
... ... 
@@ -114,17 +112,19 @@ fi
114 114 
 %{_mandir}/man1/*.1*
115 115
116 116 
 %changelog
117 
-*	Tue Feb 7 2017 Divya Thaluru <dthaluru@vmware.com> 6.19.00-6
118 
--	Added /bin/csh and /bin/tsch entries in /etc/shells
119 
-*	Wed Dec 14 2016 Alexey Makhalov <amakhalov@vmware.com> 6.19.00-5
120 
--	tcsh.glibc-2.24.patch
121 
-*	Wed May 25 2016 Anish Swaminathan <anishs@vmware.com> 6.19.00-4
122 
--	Fix calloc for gcc 5 optimization
123 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.19.00-3
124 
--	GA - Bump release of all rpms
125 
-*   	Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.19.00-2
126 
--   	Fix for upgrade issues
127 
-*	Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 6.19.00-1
128 
--	Upgrade version
129 
-*	Wed Apr 1 2015 Divya Thaluru <dthaluru@vmware.com> 6.18.01-1
130 
--	Initial build. First version
117 
+*   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 6.20.00-1
118 
+-   Updated to version 6.20.00
119 
+*   Tue Feb 07 2017 Divya Thaluru <dthaluru@vmware.com> 6.19.00-6
120 
+-   Added /bin/csh and /bin/tsch entries in /etc/shells
121 
+*   Wed Dec 14 2016 Alexey Makhalov <amakhalov@vmware.com> 6.19.00-5
122 
+-   tcsh.glibc-2.24.patch
123 
+*   Wed May 25 2016 Anish Swaminathan <anishs@vmware.com> 6.19.00-4
124 
+-   Fix calloc for gcc 5 optimization
125 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.19.00-3
126 
+-   GA - Bump release of all rpms
127 
+*   Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.19.00-2
128 
+-   Fix for upgrade issues
129 
+*   Thu Jan 21 2016 Anish Swaminathan <anishs@vmware.com> 6.19.00-1
130 
+-   Upgrade version
131 
+*   Wed Apr 1 2015 Divya Thaluru <dthaluru@vmware.com> 6.18.01-1
132 
+-   Initial build. First version
SPECS/texinfo/texinfo.spec
History View file @ ca774cb
... ... 
@@ -1,14 +1,14 @@
1 
-Summary:	Reading, writing, and converting info pages
2 
-Name:		texinfo
3 
-Version:	6.1
4 
-Release:	4%{?dist}
5 
-License:	GPLv3+
6 
-URL:		http://ftp.gnu.org/gnu/texinfo/texinfo-6.1.tar.xz
7 
-Group:		Applications/System
8 
-Vendor:		VMware, Inc.
9 
-Distribution: 	Photon
10 
-Source0:	%{name}-%{version}.tar.xz
11 
-%define sha1 texinfo=d39c2e35ddb0aff6ebdd323ce53729bd215534fa
1 
+Summary:        Reading, writing, and converting info pages
2 
+Name:           texinfo
3 
+Version:        6.3
4 
+Release:        1%{?dist}
5 
+License:        GPLv3+
6 
+URL:            http://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
7 
+Group:          Applications/System
8 
+Vendor:         VMware, Inc.
9 
+Distribution:   Photon
10 
+Source0:        %{name}-%{version}.tar.xz
11 
+%define sha1    texinfo=64568f2791d1309aaccc22e63758458fd249ec8b
12 12 
 %description
13 13 
 The Texinfo package contains programs for reading, writing,
14 14 
 and converting info pages.
... ... 
@@ -16,8 +16,8 @@ and converting info pages.
16 16 
 %setup -q
17 17 
 %build
18 18 
 ./configure \
19 
-	--prefix=%{_prefix} \
20 
-	--disable-silent-rules
19 
+    --prefix=%{_prefix} \
20 
+    --disable-silent-rules
21 21 
 make %{?_smp_mflags}
22 22
23 23 
 %install
... ... 
@@ -44,17 +44,19 @@ rm -rf %{buildroot}%{_infodir}
44 44 
 %{_libdir}/texinfo/*
45 45
46 46 
 %changelog
47 
-*       Mon Oct 04 2016 ChangLee <changlee@vmware.com> 6.1-4
48 
--       Modified %check
49 
-*	Wed Jun 27 2016 Divya Thaluru <dthaluru@vmware.com> 6.1-3
50 
--	Removed packaging of debug files
51 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.1-2
52 
--	GA - Bump release of all rpms
53 
-*       Mon Feb 22 2016 XIaolin Li <xiaolinl@vmware.com> 6.1-1
54 
--       Updated to version 6.1
55 
-*	Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 5.2-3
56 
--	Handled locale files with macro find_lang
57 
-*	Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 5.2-2
58 
--	Removing perl-libintl package from run-time required packages
59 
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.2-1
60 
--	Upgrade version
47 
+*   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 6.3-1
48 
+-   Updated to version 6.3.
49 
+*   Mon Oct 04 2016 ChangLee <changlee@vmware.com> 6.1-4
50 
+-   Modified %check
51 
+*   Wed Jun 27 2016 Divya Thaluru <dthaluru@vmware.com> 6.1-3
52 
+-   Removed packaging of debug files
53 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 6.1-2
54 
+-   GA - Bump release of all rpms
55 
+*   Mon Feb 22 2016 Xiaolin Li <xiaolinl@vmware.com> 6.1-1
56 
+-   Updated to version 6.1
57 
+*   Tue Nov 10 2015 Xiaolin Li <xiaolinl@vmware.com> 5.2-3
58 
+-   Handled locale files with macro find_lang
59 
+*   Wed Jun 3 2015 Divya Thaluru <dthaluru@vmware.com> 5.2-2
60 
+-   Removing perl-libintl package from run-time required packages
61 
+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.2-1
62 
+-   Upgrade version
SPECS/thin-provisioning-tools/thin-provisioning-tools.spec
History View file @ ca774cb
... ... 
@@ -1,17 +1,17 @@
1 
-Summary: 	Thin provisioning tools
2 
-Name:		thin-provisioning-tools
3 
-Version:	0.6.1
4 
-Release:	3%{?dist}
5 
-License:	GPLv3+
6 
-Group:		System Environment/Base
7 
-URL:		https://github.com/jthornber/thin-provisioning-tools
8 
-Source0:	https://github.com/jthornber/thin-provisioning-tools/releases/thin-provisioning-tools-%{version}.tar.gz
9 
-%define sha1 thin-provisioning-tools=387096be52b2f846b8b83f3d8da8e2cc6775465f
10 
-Patch0:		thin-provisioning-tools-fix-for-gcc-6.3.patch
11 
-BuildRequires:	expat , libaio-devel, boost-devel
12 
-Requires:	expat, libaio
13 
-Vendor:		VMware, Inc.
14 
-Distribution:	Photon
1 
+Summary:        Thin provisioning tools
2 
+Name:           thin-provisioning-tools
3 
+Version:        0.6.3
4 
+Release:        1%{?dist}
5 
+License:        GPLv3+
6 
+Group:          System Environment/Base
7 
+URL:            https://github.com/jthornber/thin-provisioning-tools
8 
+Source0:        thin-provisioning-tools-%{version}.tar.gz
9 
+%define sha1    thin-provisioning-tools=6e2db216ffaa62a8945d42d91131b94b59fe73d7
10 
+Patch0:         thin-provisioning-tools-fix-for-gcc-6.3.patch
11 
+BuildRequires:  expat , libaio-devel, boost-devel
12 
+Requires:       expat, libaio
13 
+Vendor:         VMware, Inc.
14 
+Distribution:   Photon
15 15
16 16 
 %description
17 17 
 thin-provisioning-tools contains check,dump,restore,repair,rmap
... ... 
@@ -23,7 +23,6 @@ snapshot eras
23 23
24 24 
 %prep
25 25 
 %setup -q
26 
-%patch0 -p1
27 26
28 27 
 %build
29 28 
 autoconf
... ... 
@@ -37,22 +36,7 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
37 37
38 38 
 %files
39 39 
 %doc COPYING README.md
40 
-%{_mandir}/man8/cache_check.8.gz
41 
-%{_mandir}/man8/cache_dump.8.gz
42 
-%{_mandir}/man8/cache_restore.8.gz
43 
-%{_mandir}/man8/cache_repair.8.gz
44 
-%{_mandir}/man8/era_check.8.gz
45 
-%{_mandir}/man8/era_dump.8.gz
46 
-%{_mandir}/man8/era_invalidate.8.gz
47 
-%{_mandir}/man8/thin_check.8.gz
48 
-%{_mandir}/man8/thin_dump.8.gz
49 
-%{_mandir}/man8/thin_metadata_size.8.gz
50 
-%{_mandir}/man8/thin_restore.8.gz
51 
-%{_mandir}/man8/thin_repair.8.gz
52 
-%{_mandir}/man8/thin_rmap.8.gz
53 
-%{_mandir}/man8/thin_delta.8.gz
54 
-%{_mandir}/man8/thin_ls.8.gz
55 
-%{_mandir}/man8/thin_trim.8.gz
40 
+%{_mandir}/man8/*
56 41 
 %{_sbindir}/pdata_tools
57 42 
 %{_sbindir}/cache_check
58 43 
 %{_sbindir}/cache_dump
... ... 
@@ -74,12 +58,14 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
74 74 
 %{_sbindir}/thin_trim
75 75
76 76 
 %changelog
77 
-* Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.1-3
78 
-- Fix gcc-6.3 compilation errors
79 
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.1-2
80 
-- GA - Bump release of all rpms
81 
-* Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 0.6.1-1
82 
-- Updating version
83 
-* Tue Mar 3 2015 Divya Thaluru <dthaluru@vmware.com> 0.4.1-1
84 
-- Initial version
77 
+*   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 0.6.3-1
78 
+-   Updated to version 0.6.3.
79 
+*   Mon Mar 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.6.1-3
80 
+-   Fix gcc-6.3 compilation errors
81 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.6.1-2
82 
+-   GA - Bump release of all rpms
83 
+*   Thu Feb 25 2016 Kumar Kaushik <kaushikk@vmware.com> 0.6.1-1
84 
+-   Updating version
85 
+*   Tue Mar 3 2015 Divya Thaluru <dthaluru@vmware.com> 0.4.1-1
86 
+-   Initial version
85 87
SPECS/tmux/tmux.spec
History View file @ ca774cb
... ... 
@@ -1,23 +1,24 @@
1 
-Summary:	Terminal multiplexer
2 
-Name:		tmux
3 
-Version:	2.2
4 
-Release:	1%{?dist}
5 
-License:	GPLv3+
6 
-URL:		https://tmux.github.io/
7 
-Group:		Applications/System
8 
-Vendor:		VMware, Inc.
9 
-Distribution:	Photon
10 
-Source0:	https://github.com/tmux/tmux/releases/download/%{version}/%{name}-%{version}.tar.gz
11 
-%define sha1 tmux=5ed1430bc7ef44c227e64e9401c686573dd0791a
12 
-Requires:	libevent ncurses
13 
-BuildRequires:	libevent-devel ncurses-devel
1 
+Summary:        Terminal multiplexer
2 
+Name:           tmux
3 
+Version:        2.3
4 
+Release:        1%{?dist}
5 
+License:        GPLv3+
6 
+URL:            https://tmux.github.io/
7 
+Group:          Applications/System
8 
+Vendor:         VMware, Inc.
9 
+Distribution:   Photon
10 
+Source0:        https://github.com/tmux/tmux/releases/download/%{version}/%{name}-%{version}.tar.gz
11 
+%define sha1    tmux=1296585a6a4d1509f327156b5624029a62d54583
12 
+Requires:       libevent ncurses
13 
+BuildRequires:  libevent-devel ncurses-devel
14 14 
 %description
15 15 
 Terminal multiplexer
16 16 
 %prep
17 17 
 %setup -q
18 18 
 %build
19 
+./autogen.sh
19 20 
 ./configure \
20 
-	--prefix=%{_prefix}
21 
+    --prefix=%{_prefix}
21 22 
 make %{?_smp_mflags}
22 23 
 %install
23 24 
 make DESTDIR=%{buildroot} install
... ... 
@@ -28,5 +29,7 @@ make DESTDIR=%{buildroot} install
28 28 
 /usr/share/*
29 29 
 %exclude /usr/src
30 30 
 %changelog
31 
-*	Wed Jul 13 2016 Alexey Makhalov <amakhalov@vmware.com> 2.2-1
32 
--	Initial build.	First version
31 
+*   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 2.3-1
32 
+-   Updated to version 2.3.
33 
+*   Wed Jul 13 2016 Alexey Makhalov <amakhalov@vmware.com> 2.2-1
34 
+-   Initial build.  First version
SPECS/traceroute/traceroute.spec
History View file @ ca774cb
... ... 
@@ -1,14 +1,14 @@
1 1 
 Name:           traceroute
2 2 
 Summary:        Traces the route taken by packets over an IPv4/IPv6 network
3 
-Version:        2.0.22
4 
-Release:        2%{?dist}
3 
+Version:        2.1.0
4 
+Release:        1%{?dist}
5 5 
 License:        GPLv2
6 6 
 Group:          Applications/Internet
7 7 
 Url:            http://traceroute.sourceforge.net
8 8 
 Source0:        http://downloads.sourceforge.net/project/traceroute/traceroute/traceroute-%{version}/traceroute-%{version}.tar.gz
9 
-%define sha1 traceroute=2d2797a2684fc41639f80537cefabe9a8c27fa7b
10 
-Vendor:		VMware, Inc.
11 
-Distribution:	Photon
9 
+%define sha1    traceroute=bc5c6c8022187511be5665b3818d919be5987dcc
10 
+Vendor:         VMware, Inc.
11 
+Distribution:   Photon
12 12
13 13
14 14 
 %description
... ... 
@@ -49,7 +49,9 @@ popd
49 49
50 50
51 51 
 %changelog
52 
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.22-2
53 
--	GA - Bump release of all rpms
54 
-* 	Fri Feb 26 2016 Anish Swaminathan <anishs@vmware.com>  2.0.22-1
55 
-- 	Initial version
52 
+*   Tue Mar 28 2017 Xiaolin Li <xiaolinl@vmware.com> 2.1.0-1
53 
+-   Updated to version 2.1.0.
54 
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.22-2
55 
+-   GA - Bump release of all rpms
56 
+*   Fri Feb 26 2016 Anish Swaminathan <anishs@vmware.com>  2.0.22-1
57 
+-   Initial version