Browse code

man-pages, mariadb, mc: Update to latest versions

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

Srivatsa S. Bhat authored on 2018/09/08 07:38:36
Showing 3 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:	Man pages
2 2
 Name:		man-pages
3
-Version:	4.10
3
+Version:	4.16
4 4
 Release:	1%{?dist}
5 5
 License:	GPLv2+ and BSD
6 6
 URL:		http://www.kernel.org/doc/man-pages
... ...
@@ -8,7 +8,7 @@ Group:		System Environment/Base
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10 10
 Source0:	http://www.kernel.org/pub/linux/docs/man-pages/%{name}-%{version}.tar.gz
11
-%define sha1 man-pages=8538ebbf1723ddd4709a9e1670f023463a2be56c
11
+%define sha1 man-pages=354b253235052e398fa9677fd29aacfa87b1117f
12 12
 BuildArch:	noarch
13 13
 
14 14
 %description
... ...
@@ -37,13 +37,13 @@ rm -vf %{buildroot}%{_mandir}/man5/passwd.5
37 37
 %{_mandir}/man8/*
38 38
 
39 39
 %changelog
40
-*       Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.10-1
41
--       Update pacakge version
42
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.04-2
43
--	GA - Bump release of all rpms
44
-* 	Thu Feb 25 2016 Anish Swaminathan <anishs@vmware.com>  4.04-1
45
-- 	Upgrade to 4.04
46
-*	Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.59-1
47
--	Initial build. First version
48
-
49
-
40
+*   Thu Sep 06 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.16-1
41
+-   Update to version 4.16
42
+*   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.10-1
43
+-   Update pacakge version
44
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.04-2
45
+-   GA - Bump release of all rpms
46
+*   Thu Feb 25 2016 Anish Swaminathan <anishs@vmware.com>  4.04-1
47
+-   Upgrade to 4.04
48
+*   Wed Nov 5 2014 Divya Thaluru <dthaluru@vmware.com> 3.59-1
49
+-   Initial build. First version
... ...
@@ -1,14 +1,14 @@
1 1
 Summary:        Database servers made by the original developers of MySQL.
2 2
 Name:           mariadb
3
-Version:        10.2.10
3
+Version:        10.3.9
4 4
 Release:        1%{?dist}
5 5
 License:        GPLv2
6 6
 Group:          Applications/Databases
7 7
 Vendor:         VMware, Inc.
8 8
 Distribution:   Photon
9 9
 Url:            https://mariadb.org/
10
-Source0:        http://mirrors.nodesdirect.com/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz
11
-%define         sha1 mariadb=14a7d6b5c77de5235b60ffa13bf80a1dd2dda49c
10
+Source0:        https://downloads.mariadb.org/f/mariadb-%{version}/source/mariadb-%{version}.tar.gz
11
+%define         sha1 mariadb=51e9870847daa76f1e82ade97d9cf60a31df7656
12 12
 
13 13
 BuildRequires:  cmake
14 14
 BuildRequires:  Linux-PAM-devel
... ...
@@ -79,7 +79,9 @@ cmake -DCMAKE_BUILD_TYPE=Release                        \
79 79
       -DSKIP_TESTS=ON                                   \
80 80
       -DTOKUDB_OK=0                                     \
81 81
       ..
82
-make
82
+
83
+make %{?_smp_mflags}
84
+
83 85
 %install
84 86
 cd build
85 87
 make DESTDIR=%{buildroot} install
... ...
@@ -134,6 +136,7 @@ rm -rf %{buildroot}
134 134
 %{_libdir}/libmysqlclient.so
135 135
 %{_libdir}/libmysqlclient_r.so
136 136
 %{_libdir}/libmariadb.so.*
137
+%{_libdir}/libmariadbd.so.*
137 138
 %{_bindir}/msql2mysql
138 139
 %{_bindir}/mysql
139 140
 %{_bindir}/mysql_find_rows
... ...
@@ -148,6 +151,7 @@ rm -rf %{buildroot}
148 148
 %{_bindir}/mysqlshow
149 149
 %{_bindir}/mysqlslap
150 150
 %{_bindir}/mariadb_config
151
+%{_bindir}/test-connect-t
151 152
 %{_bindir}/mysql_client_test
152 153
 %{_bindir}/mysql_client_test_embedded
153 154
 %{_bindir}/mysql_config
... ...
@@ -162,6 +166,7 @@ rm -rf %{buildroot}
162 162
 %{_bindir}/mytop
163 163
 %{_bindir}/perror
164 164
 %{_bindir}/sst_dump
165
+%{_bindir}/myrocks_hotbackup
165 166
 %{_mandir}/man1/msql2mysql.1.gz
166 167
 %{_mandir}/man1/mysql.1.gz
167 168
 %{_mandir}/man1/mysqlaccess.1.gz
... ...
@@ -207,7 +212,6 @@ rm -rf %{buildroot}
207 207
 %config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf
208 208
 %config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf
209 209
 %dir %attr(0750,mysql,mysql) %{_var}/lib/mysql
210
-%{_libdir}/libmysqld.so.*
211 210
 %{_libdir}/mysql/plugin*
212 211
 %{_bindir}/aria_chk
213 212
 %{_bindir}/aria_dump_log
... ...
@@ -238,6 +242,7 @@ rm -rf %{buildroot}
238 238
 %{_bindir}/wsrep_sst_mariabackup
239 239
 %{_bindir}/wsrep_sst_mysqldump
240 240
 %{_bindir}/wsrep_sst_rsync
241
+%{_bindir}/wsrep_sst_rsync_wan
241 242
 %{_bindir}/wsrep_sst_xtrabackup
242 243
 %{_bindir}/wsrep_sst_xtrabackup-v2
243 244
 %{_sbindir}/*
... ...
@@ -245,11 +250,6 @@ rm -rf %{buildroot}
245 245
 %{_libdir}/systemd/system/mariadb@.service
246 246
 %{_libdir}/systemd/system-preset/50-mariadb.preset
247 247
 %{_datadir}/binary-configure
248
-%{_datadir}/my-huge.cnf
249
-%{_datadir}/my-innodb-heavy-4G.cnf
250
-%{_datadir}/my-large.cnf
251
-%{_datadir}/my-medium.cnf
252
-%{_datadir}/my-small.cnf
253 248
 %{_datadir}/mysql-log-rotate
254 249
 %{_datadir}/mysql.server
255 250
 %{_datadir}/mysqld_multi.server
... ...
@@ -304,6 +304,13 @@ rm -rf %{buildroot}
304 304
 %{_datadir}/mysql/mysql_system_tables_data.sql
305 305
 %{_datadir}/mysql/mysql_test_data_timezone.sql
306 306
 %{_datadir}/mysql/mysql_to_mariadb.sql
307
+%{_datadir}/mysql/mysql_test_db.sql
308
+%license %{_datadir}/mysql/mroonga/AUTHORS
309
+%license %{_datadir}/mysql/mroonga/COPYING
310
+%license %{_datadir}/groonga-normalizer-mysql/lgpl-2.0.txt
311
+%license %{_datadir}/groonga/COPYING
312
+%doc %{_datadir}/groonga-normalizer-mysql/README.md
313
+%doc %{_datadir}/groonga/README.md
307 314
 
308 315
 
309 316
 %files server-galera
... ...
@@ -317,6 +324,7 @@ rm -rf %{buildroot}
317 317
 %{_includedir}/mysql/*
318 318
 %{_datadir}/aclocal/mysql.m4
319 319
 %{_libdir}/libmariadb.so
320
+%{_libdir}/libmariadbd.so
320 321
 %{_libdir}/libmysqld.so
321 322
 %{_datadir}/pkgconfig/mariadb.pc
322 323
 
... ...
@@ -348,6 +356,8 @@ rm -rf %{buildroot}
348 348
 %{_datadir}/mysql/hindi/errmsg.sys
349 349
 
350 350
 %changelog
351
+*   Thu Sep 06 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 10.3.9-1
352
+-   Update to version 10.3.9
351 353
 *   Tue Nov 07 2017 Xiaolin Li <xiaolinl@vmware.com> 10.2.10-1
352 354
 -   Update to verion 10.2.10 to address CVE-2017-10378, CVE-2017-10268
353 355
 *   Wed Sep 06 2017 Xiaolin Li <xiaolinl@vmware.com> 10.2.8-1
... ...
@@ -1,14 +1,14 @@
1 1
 Summary:	File manager
2 2
 Name:		mc
3
-Version:	4.8.19
4
-Release:	2%{?dist}
3
+Version:	4.8.21
4
+Release:	1%{?dist}
5 5
 License:	GPLv3+
6 6
 URL:		https://www.midnight-commander.org
7 7
 Group:		Applications/System
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution:	Photon
10 10
 Source0:	http://ftp.midnight-commander.orgtar/%{name}-%{version}.tar.xz
11
-%define sha1 mc=850747ae43a5c81f1dd0d906dfa9e149eb19748a
11
+%define sha1 mc=f66fec68e6e3e284b6e8f26d96001aa47c23b2d9
12 12
 Patch0:		disable-extfs-test.patch
13 13
 Requires:	glib pcre slang
14 14
 BuildRequires:	glib-devel pcre-devel slang-devel
... ...
@@ -41,9 +41,11 @@ make %{?_smp_mflags} -k check
41 41
 %exclude /usr/src
42 42
 
43 43
 %changelog
44
-*       Fri Aug 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.8.19-2
45
--       Disable extfs test
46
-*       Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.8.19-1
47
--       Update package version
48
-*	Tue Jul 12 2016 Alexey Makhalov <amakhalov@vmware.com> 4.8.17-1
49
--	Initial build.	First version
44
+*   Thu Sep 06 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.8.21-1
45
+-   Update to version 4.8.21
46
+*   Fri Aug 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.8.19-2
47
+-   Disable extfs test
48
+*   Fri Mar 31 2017 Michelle Wang <michellew@vmware.com> 4.8.19-1
49
+-   Update package version
50
+*   Tue Jul 12 2016 Alexey Makhalov <amakhalov@vmware.com> 4.8.17-1
51
+-   Initial build. First version