Author: arekm Date: Wed Dec 15 20:49:42 2010 GMT Module: packages Tag: HEAD ---- Log message: - build and install pass correctly. Patches still need review.
---- Files affected: packages/mysql: mysql.spec (1.498 -> 1.499) ---- Diffs: ================================================================ Index: packages/mysql/mysql.spec diff -u packages/mysql/mysql.spec:1.498 packages/mysql/mysql.spec:1.499 --- packages/mysql/mysql.spec:1.498 Wed Dec 15 20:33:43 2010 +++ packages/mysql/mysql.spec Wed Dec 15 21:49:37 2010 @@ -543,6 +543,23 @@ -DWITH_SSL=yes \ -DWITH_ZLIB=system \ -DCURSES_INCLUDE_PATH=%{_includedir}/ncurses \ + -DCMAKE_INSTALl_PREFIX="" \ + -DINSTALL_INCLUDEDIR=%{_includedir}/mysql \ + -DINSTALL_BINDIR=%{_bindir} \ + -DINSTALL_DOCDIR=%{_docdir}/%{name}-%{version} \ + -DINSTALL_DOCREADMEDIR=%{_docdir}/%{name}-%{version} \ + -DINSTALL_INFODIR=%{_infodir} \ + -DINSTALL_LIBDIR=%{_libdir} \ + -DINSTALL_MANDIR=%{_mandir} \ + -DINSTALL_MYSQLDATADIR=/var/lib/mysql \ + -DINSTALL_MYSQLSHAREDIR=%{_datadir}/mysql \ + -DINSTALL_MYSQLTESTDIR=%{_datadir}/mysql-test \ + -DINSTALL_PLUGINDIR=%{_libdir}/mysql/plugin \ + -DINSTALL_SBINDIR=%{_sbindir} \ + -DINSTALL_SCRIPTDIR=%{_bindir} \ + -DINSTALL_SHAREDIR=%{_datadir} \ + -DINSTALL_SQLBENCHDIR=%{_datadir} \ + -DINSTALL_SUPPORTFILESDIR=%{_datadir}/mysql-support \ .. %{__make} @@ -592,12 +609,13 @@ install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-cpc %endif -mv -f $RPM_BUILD_ROOT%{_libdir}/mysql/lib* $RPM_BUILD_ROOT%{_libdir} -sed -i -e 's,%{_libdir}/mysql,%{_libdir},' $RPM_BUILD_ROOT{%{_libdir}/libmysqlclient{,_r}.la,%{_bindir}/mysql_config} +#mv -f $RPM_BUILD_ROOT%{_libdir}/mysql/lib* $RPM_BUILD_ROOT%{_libdir} +#sed -i -e 's,%{_libdir}/mysql,%{_libdir},' $RPM_BUILD_ROOT{%{_libdir}/libmysqlclient{,_r}.la,%{_bindir}/mysql_config} sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config # remove known unpackaged files -rm -rf $RPM_BUILD_ROOT%{_prefix}/mysql-test +rm -rf $RPM_BUILD_ROOT%{_datadir}/mysql-test +rm -rf $RPM_BUILD_ROOT%{_datadir}/mysql-support # remove .txt variants for .sys messages rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/*/*.txt @@ -620,7 +638,7 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamchk mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamlog mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisampack -mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_fix_privilege_tables +#mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_fix_privilege_tables mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/my_print_defaults sed -i -e 's#/usr/bin/my_print_defaults#%{_sbindir}/my_print_defaults#g' $RPM_BUILD_ROOT%{_bindir}/mysql_install_db mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck @@ -632,10 +650,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/mysqld_safe rm $RPM_BUILD_ROOT%{_bindir}/mysqld_multi rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}* -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/errmsg.txt +#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate +#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server +#rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure +rm $RPM_BUILD_ROOT%{_datadir}/%{name}/errmsg-utf8.txt rm $RPM_BUILD_ROOT%{_bindir}/mysql_waitpid rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_waitpid.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql.server* @@ -643,23 +661,16 @@ rm $RPM_BUILD_ROOT%{_bindir}/resolveip rm $RPM_BUILD_ROOT%{_mandir}/man1/resolveip.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/comp_err.1* -rm $RPM_BUILD_ROOT%{_datadir}/mysql/ChangeLog # we don't package those (we have no -test or -testsuite pkg) and some of them just segfault rm $RPM_BUILD_ROOT%{_bindir}/mysql_client_test -rm $RPM_BUILD_ROOT%{_datadir}/mysql/mi_test_all -rm $RPM_BUILD_ROOT%{_datadir}/mysql/mi_test_all.res -rm $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld_multi.server rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_client_test.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_client_test_embedded.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql-stress-test.pl.1* rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql-test-run.pl.1* -# in %doc -rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.{ini,cnf} - # not needed -rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/ha_*.{a,la} +rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/libdaemon_example.* rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/ha_example.* rm -f $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/sphinx.{a,la} @@ -811,7 +822,7 @@ %files %defattr(644,root,root,755) -%doc support-files/*.cnf support-files/*.ini ChangeLog +%doc build/support-files/*.cnf build/support-files/*.ini %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mysql %attr(754,root,root) /etc/rc.d/init.d/mysql %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql @@ -821,14 +832,26 @@ %attr(755,root,root) %{_sbindir}/myisamchk %attr(755,root,root) %{_sbindir}/myisamlog %attr(755,root,root) %{_sbindir}/myisampack -%attr(755,root,root) %{_sbindir}/mysql_fix_privilege_tables +#%attr(755,root,root) %{_sbindir}/mysql_fix_privilege_tables %attr(755,root,root) %{_sbindir}/mysql_upgrade %attr(755,root,root) %{_sbindir}/mysqlcheck %attr(755,root,root) %{_sbindir}/mysqld %attr(755,root,root) %{_bindir}/mysql_install_db %dir %{_libdir}/mysql %dir %{_libdir}/mysql/plugin -%attr(755,root,root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so +%attr(755,root,root) %{_libdir}/mysql/plugin/adt_null.so +%attr(755,root,root) %{_libdir}/mysql/plugin/auth.so +%attr(755,root,root) %{_libdir}/mysql/plugin/auth_socket.so +%attr(755,root,root) %{_libdir}/mysql/plugin/auth_test_plugin.so +%attr(755,root,root) %{_libdir}/mysql/plugin/ha_archive.so +%attr(755,root,root) %{_libdir}/mysql/plugin/ha_blackhole.so +%attr(755,root,root) %{_libdir}/mysql/plugin/ha_federated.so +%attr(755,root,root) %{_libdir}/mysql/plugin/mypluglib.so +%attr(755,root,root) %{_libdir}/mysql/plugin/qa_auth_client.so +%attr(755,root,root) %{_libdir}/mysql/plugin/qa_auth_interface.so +%attr(755,root,root) %{_libdir}/mysql/plugin/qa_auth_server.so +%attr(755,root,root) %{_libdir}/mysql/plugin/semisync_master.so +%attr(755,root,root) %{_libdir}/mysql/plugin/semisync_slave.so %if %{with sphinx} %attr(755,root,root) %{_libdir}/mysql/plugin/sphinx.so %endif @@ -837,7 +860,7 @@ %{_mandir}/man1/myisamchk.1* %{_mandir}/man1/myisamlog.1* %{_mandir}/man1/myisampack.1* -%{_mandir}/man1/mysql_fix_privilege_tables.1* +#%{_mandir}/man1/mysql_fix_privilege_tables.1* %{_mandir}/man1/mysql_install_db.1* %{_mandir}/man1/mysql_upgrade.1* %{_mandir}/man1/mysqlcheck.1* @@ -865,7 +888,7 @@ %{_datadir}/mysql/english %{_datadir}/mysql/fill_help_tables.sql -%{_datadir}/mysql/mysql_fix_privilege_tables.sql +#%{_datadir}/mysql/mysql_fix_privilege_tables.sql %lang(cs) %{_datadir}/mysql/czech %lang(da) %{_datadir}/mysql/danish %lang(de) %{_datadir}/mysql/german @@ -941,7 +964,7 @@ %attr(755,root,root) %{_bindir}/mysqldump %attr(755,root,root) %{_bindir}/mysqlimport %attr(755,root,root) %{_bindir}/mysqlshow -%attr(755,root,root) %{_sbindir}/mysqlmanager +#%attr(755,root,root) %{_sbindir}/mysqlmanager %{_mandir}/man1/mysql.1* %{_mandir}/man1/mysqladmin.1* %{_mandir}/man1/mysqlbinlog.1* @@ -949,11 +972,10 @@ %{_mandir}/man1/mysqldump.1* %{_mandir}/man1/mysqlimport.1* %{_mandir}/man1/mysqlshow.1* -%{_mandir}/man8/mysqlmanager.8* +#%{_mandir}/man8/mysqlmanager.8* %files libs %defattr(644,root,root,755) -%doc EXCEPTIONS-CLIENT %attr(751,root,root) %dir %{_sysconfdir}/mysql %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/mysql-client.conf %attr(755,root,root) %{_libdir}/libmysqlclient.so.*.*.* @@ -970,21 +992,11 @@ %attr(755,root,root) %{_bindir}/mysql_config %attr(755,root,root) %{_libdir}/libmysqlclient.so %attr(755,root,root) %{_libdir}/libmysqlclient_r.so +# what's this? +%attr(755,root,root) %{_libdir}/libmysqlservices.so %if %{with ndb} %attr(755,root,root) %{_libdir}/libndbclient.so -%{_libdir}/libndbclient.la %endif -%{_libdir}/libmysqlclient.la -%{_libdir}/libmysqlclient_r.la -# static-only -%{_libdir}/libdbug.a -%{_libdir}/libheap.a -%{_libdir}/libmyisam.a -%{_libdir}/libmyisammrg.a -%{_libdir}/libmysqld.a -%{_libdir}/libmystrings.a -%{_libdir}/libmysys.a -%{_libdir}/libvio.a %{_includedir}/mysql %{_aclocaldir}/mysql.m4 %{_mandir}/man1/mysql_config.1* @@ -1078,6 +1090,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.499 2010/12/15 20:49:37 arekm +- build and install pass correctly. Patches still need review. + Revision 1.498 2010/12/15 19:33:43 arekm - builds; tons of patches need update/verification; install also problematic ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.498&r2=1.499&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit