Author: glen Date: Fri Sep 4 11:15:31 2009 GMT Module: packages Tag: HEAD ---- Log message: - -avoid-version to modules
---- Files affected: packages/mysql: mysql.spec (1.460 -> 1.461) , plugin-avoid-version.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mysql/mysql.spec diff -u packages/mysql/mysql.spec:1.460 packages/mysql/mysql.spec:1.461 --- packages/mysql/mysql.spec:1.460 Wed Sep 2 20:12:03 2009 +++ packages/mysql/mysql.spec Fri Sep 4 13:15:25 2009 @@ -34,7 +34,7 @@ Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql Version: 5.1.38 -Release: 1 +Release: 2 License: GPL + MySQL FLOSS Exception Group: Applications/Databases #Source0Download: http://dev.mysql.com/downloads/mysql/5.1.html#source @@ -69,12 +69,13 @@ Patch12: %{name}-config.patch Patch13: %{name}-errorlog-no-rename.patch Patch14: %{name}-bug-43594.patch +Patch15: plugin-avoid-version.patch # <percona patches, http://www.percona.com/percona-lab.html> -Patch15: %{name}-userstats.patch -Patch16: %{name}-microslow.patch -Patch17: %{name}-acc-pslist.patch -Patch18: %{name}-split_buf_pool_mutex_fixed_optimistic_safe.patch -Patch19: %{name}-innodb_rw_lock.patch +Patch100: %{name}-userstats.patch +Patch101: %{name}-microslow.patch +Patch102: %{name}-acc-pslist.patch +Patch103: %{name}-split_buf_pool_mutex_fixed_optimistic_safe.patch +Patch104: %{name}-innodb_rw_lock.patch # </percona> URL: http://www.mysql.com/products/database/mysql/community_edition.html BuildRequires: autoconf @@ -501,10 +502,13 @@ %patch13 -p1 %patch14 -p0 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 +# <percona %patches> +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +# </percona> %build %{__libtoolize} @@ -689,6 +693,7 @@ # not needed rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/ha_*.{a,la} +rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/ha_example.* %clean rm -rf $RPM_BUILD_ROOT @@ -854,11 +859,6 @@ %attr(755,root,root) %{_sbindir}/mysqld %dir %{_libdir}/mysql %dir %{_libdir}/mysql/plugin -%attr(755,root,root) %{_libdir}/mysql/plugin/ha_example.so.*.*.* -%attr(755,root,root) %{_libdir}/mysql/plugin/ha_example.so.0 -%attr(755,root,root) %{_libdir}/mysql/plugin/ha_example.so -%attr(755,root,root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so.*.*.* -%attr(755,root,root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so.0 %attr(755,root,root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so %{_mandir}/man1/innochecksum.1* %{_mandir}/man1/my_print_defaults.1* @@ -1104,6 +1104,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.461 2009/09/04 11:15:25 glen +- -avoid-version to modules + Revision 1.460 2009/09/02 18:12:03 arekm - up to 5.1.38 ================================================================ Index: packages/mysql/plugin-avoid-version.patch diff -u /dev/null packages/mysql/plugin-avoid-version.patch:1.1 --- /dev/null Fri Sep 4 13:15:31 2009 +++ packages/mysql/plugin-avoid-version.patch Fri Sep 4 13:15:25 2009 @@ -0,0 +1,88 @@ +--- mysql-5.1.38/plugin/daemon_example/Makefile.am~ 2009-08-21 15:11:25.000000000 +0300 ++++ mysql-5.1.38/plugin/daemon_example/Makefile.am 2009-09-04 14:01:26.664529401 +0300 +@@ -26,7 +26,7 @@ + + EXTRA_LTLIBRARIES = libdaemon_example.la + pkgplugin_LTLIBRARIES = @plugin_daemon_example_shared_target@ +-libdaemon_example_la_LDFLAGS = -module -rpath $(pkgplugindir) ++libdaemon_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) + libdaemon_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + libdaemon_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + libdaemon_example_la_SOURCES = daemon_example.cc +--- mysql-5.1.38/plugin/fulltext/Makefile.am~ 2009-08-21 15:11:25.000000000 +0300 ++++ mysql-5.1.38/plugin/fulltext/Makefile.am 2009-09-04 14:01:51.531167265 +0300 +@@ -20,7 +20,7 @@ + #noinst_LTLIBRARIES= mypluglib.la + pkgplugin_LTLIBRARIES= mypluglib.la + mypluglib_la_SOURCES= plugin_example.c +-mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir) ++mypluglib_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) + mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN + + # Don't update the files from bitkeeper +--- mysql-5.1.38/storage/innodb_plugin/Makefile.am~ 2009-08-21 15:12:38.000000000 +0300 ++++ mysql-5.1.38/storage/innodb_plugin/Makefile.am 2009-09-04 14:02:57.621203151 +0300 +@@ -330,7 +330,7 @@ + EXTRA_LTLIBRARIES= ha_innodb_plugin.la + pkgplugin_LTLIBRARIES= @plugin_innodb_plugin_shared_target@ + +-ha_innodb_plugin_la_LDFLAGS= -module -rpath $(pkgplugindir) ++ha_innodb_plugin_la_LDFLAGS= -module -avoid-version -rpath $(pkgplugindir) + ha_innodb_plugin_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) + ha_innodb_plugin_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS) + ha_innodb_plugin_la_SOURCES= $(libinnobase_a_SOURCES) +--- mysql-5.1.38/storage/example/Makefile.am~ 2009-08-21 15:12:32.000000000 +0300 ++++ mysql-5.1.38/storage/example/Makefile.am 2009-09-04 14:04:54.641149541 +0300 +@@ -34,7 +34,7 @@ + + EXTRA_LTLIBRARIES = ha_example.la + pkgplugin_LTLIBRARIES = @plugin_example_shared_target@ +-ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir) ++ha_example_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) + ha_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_example_la_SOURCES = ha_example.cc +--- mysql-5.1.38/storage/archive/Makefile.am~ 2009-08-21 15:12:32.000000000 +0300 ++++ mysql-5.1.38/storage/archive/Makefile.am 2009-09-04 14:05:53.391143885 +0300 +@@ -35,7 +35,7 @@ + + EXTRA_LTLIBRARIES = ha_archive.la + pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ +-ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) ++ha_archive_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) + ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_archive_la_SOURCES = ha_archive.cc azio.c +--- mysql-5.1.38/storage/blackhole/Makefile.am~ 2009-08-21 15:12:32.000000000 +0300 ++++ mysql-5.1.38/storage/blackhole/Makefile.am 2009-09-04 14:06:08.374683695 +0300 +@@ -34,7 +34,7 @@ + + EXTRA_LTLIBRARIES = ha_blackhole.la + pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@ +-ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir) ++ha_blackhole_la_LDFLAGS=-module -avoid-version -rpath $(pkgplugindir) + ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_blackhole_la_SOURCES=ha_blackhole.cc +--- mysql-5.1.38/storage/federated/Makefile.am~ 2009-08-21 15:12:33.000000000 +0300 ++++ mysql-5.1.38/storage/federated/Makefile.am 2009-09-04 14:06:24.741287557 +0300 +@@ -34,7 +34,7 @@ + + EXTRA_LTLIBRARIES = ha_federated.la + pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@ +-ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir) ++ha_federated_la_LDFLAGS = -module -avoid-version -rpath $(pkgplugindir) + ha_federated_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_federated_la_SOURCES = ha_federated.cc +--- mysql-5.1.38/storage/ibmdb2i/Makefile.am~ 2009-08-21 15:12:33.000000000 +0300 ++++ mysql-5.1.38/storage/ibmdb2i/Makefile.am 2009-09-04 14:07:07.067803277 +0300 +@@ -33,7 +33,7 @@ + EXTRA_LTLIBRARIES = ha_ibmdb2i.la + pkgplugin_LTLIBRARIES = @plugin_ibmdb2i_shared_target@ + ha_ibmdb2i_la_LIBADD = -liconv +-ha_ibmdb2i_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) ++ha_ibmdb2i_la_LDFLAGS = -module -avoid-version -rpath $(MYSQLLIBdir) + ha_ibmdb2i_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_ibmdb2i_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN + ha_ibmdb2i_la_SOURCES = ha_ibmdb2i.cc db2i_ileBridge.cc db2i_conversion.cc \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.460&r2=1.461&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
