summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mysql-5.5.60.spec (renamed from mysql.5.5.59.spec)17
-rw-r--r--mysql55.spec15
2 files changed, 17 insertions, 15 deletions
diff --git a/mysql.5.5.59.spec b/mysql-5.5.60.spec
index 5bd640b..1689a15 100644
--- a/mysql.5.5.59.spec
+++ b/mysql-5.5.60.spec
@@ -1,4 +1,4 @@
-# Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
%global mysql_vendor_2 Sun Microsystems, Inc.
%global mysql_vendor Oracle and/or its affiliates
-%global mysql_version 5.5.59
+%global mysql_version 5.5.60
%global mysqld_user mysql
%global mysqld_group mysql
@@ -242,10 +242,10 @@
Name: MySQL%{product_suffix}
Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases
-Version: 5.5.59
+Version: 5.5.60
Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
Distribution: %{distro_description}
-License: Copyright (c) 2000, 2017, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
+License: Copyright (c) 2000, 2018, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
Source: http://www.mysql.com/Downloads/MySQL-5.5/%{src_dir}.tar.gz
URL: http://www.mysql.com/
Packager: MySQL Release Engineering <mysql-build@oss.oracle.com>
@@ -621,12 +621,6 @@ install -m 644 "%{malloc_lib_source}" \
# Remove man pages we explicitly do not want to package, avoids 'unpackaged
# files' warning.
# This has become obsolete: rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
-rm -f $RBR%{_mandir}/man1/mysql-stress-test.pl.1
-rm -f $RBR%{_mandir}/man1/mysql-test-run.pl.1
-rm -f $RBR%{_mandir}/man1/mysql_client_test.1
-rm -f $RBR%{_mandir}/man1/mysql_client_test_embedded.1
-rm -f $RBR%{_mandir}/man1/mysqltest.1
-rm -f $RBR%{_mandir}/man1/mysqltest_embedded.1
##############################################################################
# Post processing actions, i.e. when installed
@@ -1228,6 +1222,9 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
+* Wed Jan 10 2018 Bjorn Munch <bjorn.munch@oracle.com>
+- No longer need to remove obsoleted mysqltest man pages
+
* Tue Oct 31 2017 Bjorn Munch <bjorn.munch@oracle.com>
- Remove obsoleted mysqltest man pages
diff --git a/mysql55.spec b/mysql55.spec
index 2ecd7ae..a01fa4d 100644
--- a/mysql55.spec
+++ b/mysql55.spec
@@ -1,5 +1,5 @@
Name: mysql
-Version: 5.5.59
+Version: 5.5.60
Release: 1%{?dist}
Summary: MySQL client programs and shared libraries
@@ -665,7 +665,7 @@ fi
%{_mandir}/man1/mysqlimport.1*
%{_mandir}/man1/mysqlman.1*
%{_mandir}/man1/mysql_setpermission.1*
-%{_mandir}/man1/mysqltest.1*
+#{_mandir}/man1/mysqltest.1*
%{_mandir}/man1/innochecksum.1*
%{_mandir}/man1/perror.1*
%{_mandir}/man1/replace.1*
@@ -704,8 +704,8 @@ fi
%{_libdir}/mysql/libmysqld.so
%{_bindir}/mysql_client_test_embedded
%{_bindir}/mysqltest_embedded
-%{_mandir}/man1/mysql_client_test_embedded.1*
-%{_mandir}/man1/mysqltest_embedded.1*
+#{_mandir}/man1/mysql_client_test_embedded.1*
+#{_mandir}/man1/mysqltest_embedded.1*
%files bench
%{_datadir}/sql-bench
@@ -715,9 +715,14 @@ fi
%{_bindir}/my_safe_process
%attr(-,mysql,mysql) %{_datadir}/mysql-test
-%{_mandir}/man1/mysql_client_test.1*
+#{_mandir}/man1/mysql_client_test.1*
+
%changelog
+* Fri Apr 20 2018 Remi Collet <remi@remirepo.net> - 5.5.60-1
+- update to MySQL 5.5.60 Community Server GA
+ http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-60.html
+
* Tue Jan 16 2018 Remi Collet <remi@remirepo.net> - 5.5.59-1
- update to MySQL 5.5.59 Community Server GA
http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-59.html