Browse code

Update lttng-tools, lua, lzo, m4, man-pages, mpfr and nano

Change-Id: I7c8546a9936f8ecf680df7d1395febbb763bf26c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2552
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

michellewang-ubuntu authored on 2017/04/28 23:44:39
Showing 8 changed files
... ...
@@ -1,21 +1,22 @@
1 1
 Summary: LTTng is an open source tracing framework for Linux.
2 2
 Name:    lttng-tools
3
-Version: 2.7.1
4
-Release: 3%{?dist}
3
+Version: 2.9.4
4
+Release: 1%{?dist}
5 5
 License: GPLv2 and LGPLv2
6 6
 URL: https://lttng.org/download/
7 7
 Source: %{name}-%{version}.tar.bz2
8
-%define sha1 lttng-tools=f0c24ddc0ef370b0194c2c6d3b0a2dc19348c8aa
8
+%define sha1 lttng-tools=ab1945fd36b30f445eb5c83f199b011d42525612
9 9
 Group:      Development/Tools
10 10
 Vendor:     VMware, Inc.
11 11
 Distribution:  Photon
12 12
 
13
-BuildRequires: libxml2-devel
13
+BuildRequires: libxml2-devel >= 2.7.6
14 14
 BuildRequires: nss-devel
15 15
 BuildRequires: m4
16 16
 BuildRequires: elfutils-devel
17 17
 BuildRequires: popt-devel
18
-BuildRequires: userspace-rcu-devel
18
+BuildRequires: userspace-rcu-devel >= 0.8.0
19
+BuildRequires: lttng-ust-devel >= 2.9.0
19 20
 Requires:      userspace-rcu
20 21
 Requires:      elfutils
21 22
 Requires:      nss
... ...
@@ -45,11 +46,14 @@ find %{buildroot} -name '*.la' -delete
45 45
 %exclude %{_libdir}/debug
46 46
 
47 47
 %changelog
48
-*	Tue Jul 26 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.1-3
49
--	Added userspace-rcu-devel as build time dependent package
50
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.1-2
51
--	GA - Bump release of all rpms
48
+*   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 2.9.4-1
49
+-   Update package version
50
+*   Tue Jul 26 2016 Divya Thaluru <dthaluru@vmware.com> 2.7.1-3
51
+-   Added userspace-rcu-devel as build time dependent package
52
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.7.1-2
53
+-   GA - Bump release of all rpms
52 54
 *   Thu Jan 28 2016 Xiaolin Li <xiaolinl@vmware.com> 2.7.1-1
53 55
 -   Updated to version 2.7.1
54
-*	Tue Nov 24 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7.0-1
56
+*   Tue Nov 24 2015 Xiaolin Li <xiaolinl@vmware.com> 2.7.0-1
55 57
 -   Initial build.  First version
58
+ 
56 59
new file mode 100755
... ...
@@ -0,0 +1,61 @@
0
+Submitted By:            Igor Živković <contact@igor-zivkovic.from.hr>
1
+Date:                    2013-06-19
2
+Initial Package Version: 5.2.2
3
+Upstream Status:         Rejected
4
+Origin:                  Arch Linux packages repository
5
+Description:             Adds the compilation of a shared library.
6
+
7
+diff -Naur lua-5.3.0.orig/Makefile lua-5.3.0/Makefile
8
+--- lua-5.3.0.orig/Makefile	2014-10-30 00:14:41.000000000 +0100
9
+@@ -52,7 +52,7 @@
10
+ all:	$(PLAT)
11
+ 
12
+ $(PLATS) clean:
13
+-	cd src && $(MAKE) $@
14
++	cd src && $(MAKE) $@ V=$(V) R=$(R)
15
+ 
16
+ test:	dummy
17
+ 	src/lua -v
18
+diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile
19
+--- lua-5.3.0.orig/src/Makefile	2015-01-05 17:04:52.000000000 +0100
20
+@@ -7,7 +7,7 @@
21
+ PLAT= none
22
+ 
23
+ CC= gcc -std=gnu99
24
+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
25
++CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
26
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
27
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
28
+ 
29
+@@ -29,6 +29,7 @@
30
+ PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
31
+ 
32
+ LUA_A=	liblua.a
33
++LUA_SO= liblua.so
34
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
35
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
36
+ 	ltm.o lundump.o lvm.o lzio.o
37
+@@ -43,7 +44,7 @@
38
+ LUAC_O=	luac.o
39
+ 
40
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
41
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
42
++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
43
+ ALL_A= $(LUA_A)
44
+ 
45
+ # Targets start here.
46
+@@ -59,6 +60,12 @@
47
+ 	$(AR) $@ $(BASE_O)
48
+ 	$(RANLIB) $@
49
+ 
50
++$(LUA_SO): $(CORE_O) $(LIB_O)
51
++	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
52
++	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
53
++	ln -sf $(LUA_SO).$(R) $(LUA_SO)
54
++
55
++
56
+ $(LUA_T): $(LUA_O) $(LUA_A)
57
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
58
+ 
... ...
@@ -1,15 +1,15 @@
1 1
 Summary:	Programming language
2 2
 Name:		lua
3
-Version:	5.3.2
4
-Release:	2%{?dist}
3
+Version:	5.3.4
4
+Release:	1%{?dist}
5 5
 License:	MIT
6 6
 URL:		http://www.lua.org
7 7
 Group:		Development/Tools
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: Photon
10
-Source0:	ttp://www.lua.org/ftp/%{name}-%{version}.tar.gz
11
-%define sha1 lua=7a47adef554fdca7d0c5536148de34579134a973
12
-Patch0:		lua-5.3.2-shared_library-1.patch
10
+Source0:	http://www.lua.org/ftp/%{name}-%{version}.tar.gz
11
+%define sha1 lua=79790cfd40e09ba796b01a571d4d63b52b1cd950
12
+Patch0:		lua-5.3.4-shared_library-1.patch
13 13
 BuildRequires:	readline-devel
14 14
 Requires:	readline
15 15
 %description
... ...
@@ -34,14 +34,14 @@ make VERBOSE=1 %{?_smp_mflags} linux
34 34
 %install
35 35
 make %{?_smp_mflags} \
36 36
 	INSTALL_TOP=%{buildroot}/usr TO_LIB="liblua.so \
37
-	liblua.so.5.3 liblua.so.5.3.2" \
37
+	liblua.so.5.3 liblua.so.5.3.4" \
38 38
 	INSTALL_DATA="cp -d" \
39 39
 	INSTALL_MAN=%{buildroot}/usr/share/man/man1 \
40 40
 	install
41 41
 install -vdm 755 %{buildroot}%{_libdir}/pkgconfig
42 42
 cat > %{buildroot}%{_libdir}/pkgconfig/lua.pc <<- "EOF"
43 43
 	V=5.3
44
-	R=5.3.2
44
+	R=5.3.4
45 45
 
46 46
 	prefix=/usr
47 47
 	INSTALL_BIN=${prefix}/bin
... ...
@@ -81,9 +81,11 @@ rm -rf %{buildroot}
81 81
 %{_libdir}/liblua.so
82 82
 
83 83
 %changelog
84
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.3.2-2
85
--	GA - Bump release of all rpms
86
-*	Wed Apr 27 2016 Xiaolin Li <xiaolinl@vmware.com> 5.3.2-1
84
+*   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 5.3.4-1
85
+-   Update package version
86
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 5.3.2-2
87
+-   GA - Bump release of all rpms
88
+*   Wed Apr 27 2016 Xiaolin Li <xiaolinl@vmware.com> 5.3.2-1
87 89
 -   Update to version 5.3.2.
88
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.2.3-1
89
--	Initial build.	First version
90
+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 5.2.3-1
91
+-   Initial build.	First version
... ...
@@ -1,12 +1,12 @@
1 1
 Name:           lzo
2
-Version:        2.09
3
-Release:        2%{?dist}
2
+Version:        2.10
3
+Release:        1%{?dist}
4 4
 Summary:        Data compression library with very fast (de)compression
5 5
 Group:          System Environment/Libraries
6 6
 License:        GPLv2+
7 7
 URL:            http://www.oberhumer.com/opensource/lzo/
8 8
 Source0:        http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
9
-%define sha1 lzo=e2a60aca818836181e7e6f8c4f2c323aca6ac057
9
+%define sha1 lzo=4924676a9bae5db58ef129dc1cebce3baa3c4b5d
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12 12
 BuildRequires:  zlib-devel
... ...
@@ -74,7 +74,6 @@ rm -rf %{buildroot}
74 74
 
75 75
 %postun minilzo -p /sbin/ldconfig
76 76
 
77
-
78 77
 %files
79 78
 %defattr(-,root,root,-)
80 79
 %{_libdir}/liblzo2.so.*
... ...
@@ -90,9 +89,12 @@ rm -rf %{buildroot}
90 90
 %{_datadir}/doc/lzo
91 91
 %{_includedir}/lzo
92 92
 %{_libdir}/lib*lzo*.so
93
+%{_libdir}/pkgconfig/lzo2.pc
93 94
 
94 95
 %changelog
95
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.09-2
96
--	GA - Bump release of all rpms
97
-* Thu Feb 26 2015 Divya Thaluru <dthaluru@vmware.com> 2.09-1
98
-- Initial version
96
+*   Tue Apr 4 2017 Michelle Wang <michellew@vmware.com> 2.10-1
97
+-   Update package version
98
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.09-2
99
+-   GA - Bump release of all rpms
100
+*   Thu Feb 26 2015 Divya Thaluru <dthaluru@vmware.com> 2.09-1
101
+-   Initial version
... ...
@@ -1,16 +1,18 @@
1 1
 Summary:	A macro processor
2 2
 Name:		m4
3
-Version:	1.4.17
4
-Release:	3%{?dist}
3
+Version:	1.4.18
4
+Release:	1%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		http://www.gnu.org/software/m4
7 7
 Group:		Development/Tools
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10
-Source0:	http://ftp.gnu.org/gnu/m4/%{name}-%{version}.tar.xz
11
-%define sha1 m4=74ad71fa100ec8c13bc715082757eb9ab1e4bbb0
10
+Source0:	http://ftp.gnu.org/gnu/m4/%{name}-%{version}.tar.gz
11
+%define sha1 m4=2f76f8105a45b05c8cfede97b3193cd88b31c657
12
+
12 13
 %description
13 14
 The M4 package contains a macro processor
15
+
14 16
 %prep
15 17
 %setup -q
16 18
 %build
... ...
@@ -18,17 +20,23 @@ The M4 package contains a macro processor
18 18
 	--prefix=%{_prefix} \
19 19
 	--disable-silent-rules
20 20
 make %{?_smp_mflags}
21
+
21 22
 %install
22 23
 make DESTDIR=%{buildroot} install
23 24
 rm -rf %{buildroot}%{_infodir}
25
+
24 26
 %check
25 27
 sed -i -e '41s/ENOENT/& || errno == EINVAL/' tests/test-readlink.h
26 28
 make  %{?_smp_mflags}  check
29
+
27 30
 %files
28 31
 %defattr(-,root,root)
29 32
 %{_bindir}/*
30 33
 %{_mandir}/*/*
34
+
31 35
 %changelog
36
+*       Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 1.4.18-1
37
+-       Update package version
32 38
 *       Fri Oct 07 2016 ChangLee <changlee@vmware.com> 1.4.17-3
33 39
 -       Modified %check
34 40
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.4.17-2
... ...
@@ -1,26 +1,31 @@
1 1
 Summary:	Man pages
2 2
 Name:		man-pages
3
-Version:	4.04
4
-Release:	2%{?dist}
3
+Version:	4.10
4
+Release:	1%{?dist}
5 5
 License:	GPLv2+ and BSD
6 6
 URL:		http://www.kernel.org/doc/man-pages
7 7
 Group:		System Environment/Base
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10
-Source0:	http://www.kernel.org/pub/linux/docs/man-pages/%{name}-%{version}.tar.xz
11
-%define sha1 man-pages=a8fe81cbea71d1b0bdf9e6d185dd5826da575010
10
+Source0:	http://www.kernel.org/pub/linux/docs/man-pages/%{name}-%{version}.tar.gz
11
+%define sha1 man-pages=8538ebbf1723ddd4709a9e1670f023463a2be56c
12 12
 BuildArch:	noarch
13
+
13 14
 %description
14 15
 The Man-pages package contains over 1,900 man pages.
16
+
15 17
 %prep
16 18
 %setup -q
17 19
 %build
20
+
18 21
 %install
19 22
 make DESTDIR=%{buildroot} install
20 23
 #	The following man pages conflict with other packages
21 24
 rm -vf %{buildroot}%{_mandir}/man3/getspnam.3
22 25
 rm -vf %{buildroot}%{_mandir}/man5/passwd.5
26
+
23 27
 %files
28
+
24 29
 %defattr(-,root,root)
25 30
 %{_mandir}/man1/*
26 31
 %{_mandir}/man2/*
... ...
@@ -30,7 +35,10 @@ rm -vf %{buildroot}%{_mandir}/man5/passwd.5
30 30
 %{_mandir}/man6/*
31 31
 %{_mandir}/man7/*
32 32
 %{_mandir}/man8/*
33
+
33 34
 %changelog
35
+*       Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.10-1
36
+-       Update pacakge version
34 37
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.04-2
35 38
 -	GA - Bump release of all rpms
36 39
 * 	Thu Feb 25 2016 Anish Swaminathan <anishs@vmware.com>  4.04-1
... ...
@@ -1,22 +1,24 @@
1 1
 Summary:	Functions for multiple precision math
2 2
 Name:		mpfr
3
-Version:	3.1.3
4
-Release:	3%{?dist}
3
+Version:	3.1.5
4
+Release:	1%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		http://www.mpfr.org
7 7
 Group:		Applications/System
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:   Photon
10
-Source0:	http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz
11
-%define sha1 mpfr=383303f9de5ebe055b03b94642b03465baf9e6c7
10
+Source0:	http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.gz
11
+%define sha1 mpfr=2a2118179f8f3c682389dcddc800d30132e8794a
12 12
 Requires:	gmp
13 13
 %description
14 14
 The MPFR package contains functions for multiple precision math.
15 15
 %package	devel
16 16
 Summary:	Header and development files for mpfr
17 17
 Requires:	%{name} = %{version}
18
+
18 19
 %description	devel
19 20
 It contains the libraries and header files to create applications 
21
+
20 22
 %prep
21 23
 %setup -q
22 24
 %build
... ...
@@ -26,6 +28,7 @@ It contains the libraries and header files to create applications
26 26
 	--docdir=%{_defaultdocdir}/%{name}-%{version} \
27 27
 	--disable-silent-rules
28 28
 make %{?_smp_mflags}
29
+
29 30
 %install
30 31
 make DESTDIR=%{buildroot} install
31 32
 find %{buildroot}%{_libdir} -name '*.la' -delete
... ...
@@ -38,26 +41,30 @@ make %{?_smp_mflags} check
38 38
 %postun	-p /sbin/ldconfig
39 39
 %files
40 40
 %defattr(-,root,root)
41
-%{_libdir}/libmpfr.so.4.1.3
41
+%{_libdir}/libmpfr.so.4.1.5
42 42
 %{_libdir}/libmpfr.so.4
43
-%{_docdir}/mpfr-3.1.3/NEWS
44
-%{_docdir}/mpfr-3.1.3/FAQ.html
45
-%{_docdir}/mpfr-3.1.3/examples/version.c
46
-%{_docdir}/mpfr-3.1.3/examples/rndo-add.c
47
-%{_docdir}/mpfr-3.1.3/examples/ReadMe
48
-%{_docdir}/mpfr-3.1.3/examples/sample.c
49
-%{_docdir}/mpfr-3.1.3/examples/divworst.c
50
-%{_docdir}/mpfr-3.1.3/COPYING.LESSER
51
-%{_docdir}/mpfr-3.1.3/TODO
52
-%{_docdir}/mpfr-3.1.3/BUGS
53
-%{_docdir}/mpfr-3.1.3/AUTHORS
54
-%{_docdir}/mpfr-3.1.3/COPYING
43
+
55 44
 %files devel
56 45
 %{_includedir}/mpf2mpfr.h
57 46
 %{_includedir}/mpfr.h
58 47
 %{_libdir}/libmpfr.a
59 48
 %{_libdir}/libmpfr.so
49
+%{_docdir}/mpfr-3.1.5/NEWS
50
+%{_docdir}/mpfr-3.1.5/FAQ.html
51
+%{_docdir}/mpfr-3.1.5/examples/version.c
52
+%{_docdir}/mpfr-3.1.5/examples/rndo-add.c
53
+%{_docdir}/mpfr-3.1.5/examples/ReadMe
54
+%{_docdir}/mpfr-3.1.5/examples/sample.c
55
+%{_docdir}/mpfr-3.1.5/examples/divworst.c
56
+%{_docdir}/mpfr-3.1.5/COPYING.LESSER
57
+%{_docdir}/mpfr-3.1.5/TODO
58
+%{_docdir}/mpfr-3.1.5/BUGS
59
+%{_docdir}/mpfr-3.1.5/AUTHORS
60
+%{_docdir}/mpfr-3.1.5/COPYING
61
+
60 62
 %changelog
63
+*       Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 3.1.5-1
64
+-       Update package version
61 65
 *       Mon Oct 03 2016 ChangLee <changlee@vmware.com> 3.1.3-3
62 66
 -       Modified %check
63 67
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 3.1.3-2
... ...
@@ -1,18 +1,26 @@
1 1
 Summary:	Text editor
2 2
 Name:		nano
3
-Version:	2.5.2
4
-Release:	3%{?dist}
3
+Version:	2.8.0
4
+Release:	1%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		http://www.nano-editor.org/
7 7
 Group:		Applications/Editors
8
-Source0:	http://www.nano-editor.org/dist/v2.2/%{name}-%{version}.tar.gz
9
-%define sha1 nano=ee21ed3f3771f6959bf430ab9e80de56026798b8
8
+Source0:	http://www.nano-editor.org/dist/v2.2/%{name}-%{version}.tar.xz
9
+%define sha1 nano=d18c8c2793efdc9a2516a286677aa30537bde406
10 10
 Vendor:		VMware, Inc.
11 11
 Distribution:	Photon
12 12
 BuildRequires:	ncurses-devel
13 13
 Requires:	ncurses
14
+
14 15
 %description
15 16
 The Nano package contains a small, simple text editor
17
+
18
+%package lang
19
+Summary:	Lang for nano
20
+Requires:	%{name} = %{version}
21
+%description lang
22
+Lang for nano
23
+
16 24
 %prep
17 25
 %setup -q -n %{name}-%{version}
18 26
 %build
... ...
@@ -22,25 +30,30 @@ The Nano package contains a small, simple text editor
22 22
             --infodir=%{_infodir}/%{name}-%{version} \
23 23
             --docdir=%{_docdir}/%{name}-%{version}
24 24
 make
25
+
25 26
 %install
26 27
 make DESTDIR=%{buildroot} install
27
-install -v -m644 %{_builddir}/%{name}-%{version}/doc/nanorc.sample %{_sysconfdir}
28
-install -v -m644 %{_builddir}/%{name}-%{version}/doc/texinfo/nano.html %{_docdir}/%{name}-%{version}.html
28
+install -v -m644 %{_builddir}/%{name}-%{version}/doc/sample.nanorc %{_sysconfdir}
29
+install -v -m644 %{_builddir}/%{name}-%{version}/doc/nano.html %{_docdir}/%{name}-%{version}.html
29 30
 %find_lang %{name}
30 31
 
31 32
 %check
32 33
 make %{?_smp_mflags} check
33 34
 
34
-%files -f %{name}.lang
35
+%files lang -f %{name}.lang
36
+%defattr(-,root,root)
37
+
38
+%files
35 39
 %defattr(-,root,root)
36 40
 %{_bindir}/*
37 41
 %{_mandir}/man*/*
38
-%{_mandir}/fr/man*/*
39 42
 %{_infodir}/%{name}-%{version}/*
40 43
 %{_datadir}/nano/*
41
-%{_datadir}/doc/nano-2.5.2/*
44
+%{_datadir}/doc/%{name}-%{version}/*
42 45
 
43 46
 %changelog
47
+*       Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 2.8.0-1
48
+-       Update package version
44 49
 *       Mon Oct 03 2016 ChangLee <changlee@vmware.com> 2.5.2-3
45 50
 -       Modified check
46 51
 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.5.2-2