From: Marcin Krol Date: Thu, 5 Jun 2014 10:53:27 +0000 (+0000) Subject: - revert s/mysql/percona-server/ - breaks build X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=66b5397460d30f7b9da47f68ce02eb248791795c;p=packages%2Fmysql.git - revert s/mysql/percona-server/ - breaks build --- diff --git a/mysql.spec b/mysql.spec index 1bc74b8..cfda9df 100644 --- a/mysql.spec +++ b/mysql.spec @@ -543,7 +543,7 @@ cd build -DINSTALL_MYSQLTESTDIR_RPM="" \ -DINSTALL_PLUGINDIR=%{_libdir}/%{name}/plugin \ -DINSTALL_SQLBENCHDIR=%{_datadir} \ - -DINSTALL_SUPPORTFILESDIR=%{_datadir}/%{_orgname}-support \ + -DINSTALL_SUPPORTFILESDIR=%{_datadir}/%{name}-support \ -DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \ %{?debug:-DWITH_DEBUG=ON} \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ @@ -590,7 +590,7 @@ touch $RPM_BUILD_ROOT/var/log/%{name}/{mysqld,query,slow}.log cp mysqld.conf mysqld.tmp awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf -cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysqld.conf +cp -a mysqld.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.conf cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/mysql-client.conf ln -s mysql-client.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/my.cnf cp -a %{SOURCE14} $RPM_BUILD_ROOT/etc/skel/.my.cnf @@ -610,7 +610,7 @@ sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config sed -i -e '/libs/s/-lprobes_mysql//' $RPM_BUILD_ROOT%{_bindir}/mysql_config # remove known unpackaged files -%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{_orgname}-support +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}-support # rename not to be so generic name mv $RPM_BUILD_ROOT%{_bindir}/{,mysql_}resolve_stack_dump @@ -623,9 +623,9 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}/mysqlaccess.conf %{!?debug:%{__rm} $RPM_BUILD_ROOT%{_bindir}/mysql_resolve_stack_dump} %{!?debug:%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mysql_resolve_stack_dump.1} # generate symbols file, so one can generate backtrace using it -# mysql_resolve_stack_dump -s %{_datadir}/%{_orgname}/mysqld.sym -n mysqld.stack. +# mysql_resolve_stack_dump -s %{_datadir}/%{name}/mysqld.sym -n mysqld.stack. # http://dev.mysql.com/doc/refman/5.0/en/using-stack-trace.html -%{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysqld.sym} +%{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/%{name}/mysqld.sym} # do not clobber users $PATH mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_plugin @@ -644,10 +644,10 @@ mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck %{__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}/%{_orgname}/mysql-log-rotate -#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/mysql.server -#rm $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/binary-configure -%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{_orgname}/errmsg-utf8.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* @@ -779,7 +779,7 @@ done %banner -e %{name}-4.1.x <<-EOF If you want to use new help tables in MySQL 4.1.x then You'll need to import the help data: - mysql -u mysql mysql < %{_datadir}/%{_orgname}/fill_help_tables.sql + mysql -u mysql mysql < %{_datadir}/%{name}/fill_help_tables.sql EOF #' @@ -919,7 +919,7 @@ done %if %{?debug:1}0 %attr(755,root,root) %{_bindir}/*resolve_stack_dump -%{_datadir}/%{_orgname}/mysqld.sym +%{_datadir}/%{name}/mysqld.sym %{_mandir}/man1/*resolve_stack_dump.1* %endif @@ -931,45 +931,45 @@ done %attr(640,mysql,mysql) %ghost /var/log/mysql/* # This is template for configuration file which is created after 'service mysql init' -%{_datadir}/%{_orgname}/mysqld.conf -%{_datadir}/%{_orgname}/mysql_security_commands.sql -%{_datadir}/%{_orgname}/mysql_system_tables_data.sql -%{_datadir}/%{_orgname}/mysql_system_tables.sql -%{_datadir}/%{_orgname}/mysql_test_data_timezone.sql - -%{_datadir}/%{_orgname}/english -%{_datadir}/%{_orgname}/dictionary.txt -%{_datadir}/%{_orgname}/fill_help_tables.sql -%{_datadir}/%{_orgname}/innodb_memcached_config.sql -#%{_datadir}/%{_orgname}/mysql_fix_privilege_tables.sql -%lang(bg) %{_datadir}/%{_orgname}/bulgarian -%lang(cs) %{_datadir}/%{_orgname}/czech -%lang(da) %{_datadir}/%{_orgname}/danish -%lang(de) %{_datadir}/%{_orgname}/german -%lang(el) %{_datadir}/%{_orgname}/greek -%lang(es) %{_datadir}/%{_orgname}/spanish -%lang(et) %{_datadir}/%{_orgname}/estonian -%lang(fr) %{_datadir}/%{_orgname}/french -%lang(hu) %{_datadir}/%{_orgname}/hungarian -%lang(it) %{_datadir}/%{_orgname}/italian -%lang(ja) %{_datadir}/%{_orgname}/japanese -%lang(ko) %{_datadir}/%{_orgname}/korean -%lang(nl) %{_datadir}/%{_orgname}/dutch -%lang(nb) %{_datadir}/%{_orgname}/norwegian -%lang(nn) %{_datadir}/%{_orgname}/norwegian-ny -%lang(pl) %{_datadir}/%{_orgname}/polish -%lang(pt) %{_datadir}/%{_orgname}/portuguese -%lang(ro) %{_datadir}/%{_orgname}/romanian -%lang(ru) %{_datadir}/%{_orgname}/russian -%lang(sr) %{_datadir}/%{_orgname}/serbian -%lang(sk) %{_datadir}/%{_orgname}/slovak -%lang(sv) %{_datadir}/%{_orgname}/swedish -%lang(uk) %{_datadir}/%{_orgname}/ukrainian +%{_datadir}/%{name}/mysqld.conf +%{_datadir}/%{name}/mysql_security_commands.sql +%{_datadir}/%{name}/mysql_system_tables_data.sql +%{_datadir}/%{name}/mysql_system_tables.sql +%{_datadir}/%{name}/mysql_test_data_timezone.sql + +%{_datadir}/%{name}/english +%{_datadir}/%{name}/dictionary.txt +%{_datadir}/%{name}/fill_help_tables.sql +%{_datadir}/%{name}/innodb_memcached_config.sql +#%{_datadir}/%{name}/mysql_fix_privilege_tables.sql +%lang(bg) %{_datadir}/%{name}/bulgarian +%lang(cs) %{_datadir}/%{name}/czech +%lang(da) %{_datadir}/%{name}/danish +%lang(de) %{_datadir}/%{name}/german +%lang(el) %{_datadir}/%{name}/greek +%lang(es) %{_datadir}/%{name}/spanish +%lang(et) %{_datadir}/%{name}/estonian +%lang(fr) %{_datadir}/%{name}/french +%lang(hu) %{_datadir}/%{name}/hungarian +%lang(it) %{_datadir}/%{name}/italian +%lang(ja) %{_datadir}/%{name}/japanese +%lang(ko) %{_datadir}/%{name}/korean +%lang(nl) %{_datadir}/%{name}/dutch +%lang(nb) %{_datadir}/%{name}/norwegian +%lang(nn) %{_datadir}/%{name}/norwegian-ny +%lang(pl) %{_datadir}/%{name}/polish +%lang(pt) %{_datadir}/%{name}/portuguese +%lang(ro) %{_datadir}/%{name}/romanian +%lang(ru) %{_datadir}/%{name}/russian +%lang(sr) %{_datadir}/%{name}/serbian +%lang(sk) %{_datadir}/%{name}/slovak +%lang(sv) %{_datadir}/%{name}/swedish +%lang(uk) %{_datadir}/%{name}/ukrainian %files charsets %defattr(644,root,root,755) -%dir %{_datadir}/%{_orgname} -%{_datadir}/%{_orgname}/charsets +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/charsets %files extras %defattr(644,root,root,755)