From: Joerg Bruehe
Date: December 10 2012 5:27pm
Subject: bzr push into mysql-5.6 branch (joerg.bruehe:4570 to 4571)
List-Archive: http://lists.mysql.com/commits/145468
Message-Id: <20121210172722.4038.37009.4571@trift-6core.fambruehe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4571 Joerg Bruehe	2012-12-10
      Spec file for ULN RPMs: Handle new files of 5.6

    modified:
      packaging/rpm-uln/mysql.spec.sh
 4570 Joerg Bruehe	2012-12-10
      Apply WL#6055 to the spec file for ULN RPMs.

    modified:
      packaging/rpm-uln/mysql.spec.sh
=== modified file 'packaging/rpm-uln/mysql.spec.sh'
--- a/packaging/rpm-uln/mysql.spec.sh	2012-12-10 12:15:39 +0000
+++ b/packaging/rpm-uln/mysql.spec.sh	2012-12-10 17:24:13 +0000
@@ -655,6 +655,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
+rm -fr ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
 rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
 
@@ -796,6 +797,7 @@ fi
 %{_bindir}/mysqlshow
 %{_bindir}/mysqlslap
 %{_bindir}/my_print_defaults
+%{_bindir}/mysql_config_editor
 
 %{_mandir}/man1/mysql.1*
 %{_mandir}/man1/mysql_config.1*
@@ -807,6 +809,7 @@ fi
 %{_mandir}/man1/mysqlshow.1*
 %{_mandir}/man1/mysqlslap.1*
 %{_mandir}/man1/my_print_defaults.1*
+%{_mandir}/man1/mysql_config_editor.1*
 
 %{_libdir}/mysql/mysqlbug
 %{_libdir}/mysql/mysql_config
@@ -823,6 +826,7 @@ fi
 
 %dir %{_datadir}/mysql
 %{_datadir}/mysql/english
+%lang(bg) %{_datadir}/mysql/bulgarian
 %lang(cs) %{_datadir}/mysql/czech
 %lang(da) %{_datadir}/mysql/danish
 %lang(nl) %{_datadir}/mysql/dutch
@@ -929,9 +933,12 @@ fi
 %{_mandir}/man1/mysql_tzinfo_to_sql.1*
 %{_mandir}/man8/mysqld.8*
 
+%{_datadir}/mysql/dictionary.txt
 %{_datadir}/mysql/errmsg-utf8.txt
 %{_datadir}/mysql/fill_help_tables.sql
+%{_datadir}/mysql/innodb_memcached_config.sql
 %{_datadir}/mysql/magic
+%{_datadir}/mysql/mysql_security_commands.sql
 %{_datadir}/mysql/mysql_system_tables.sql
 %{_datadir}/mysql/mysql_system_tables_data.sql
 %{_datadir}/mysql/mysql_test_data_timezone.sql
@@ -974,6 +981,7 @@ fi
 %changelog
 * Mon Dec 10 2012 Joerg Bruehe <joerg.bruehe@stripped>
 - Replace old my-*.cnf config file examples with template my-default.cnf
+- Handle several files for packaging which are new in 5.6 (compared to 5.5).
 
 * Thu Dec  7 2012 Joerg Bruehe <joerg.bruehe@stripped>
 - Change the way in which "libmysqld.so" is created: Using all object modules

No bundle (reason: useless for push emails).