- updated to 3.23.52: only bugfixes (fixed one security bug when having an

[packages/mysql.git] / mysql.spec

diff --git a/mysql.spec b/mysql.spec
index d2da465c9a467fc7f60d598b4e0514ccdec86d68..3c6004206030f401de3162109b325f32173d40fc 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -10,8 +10,8 @@ Summary(uk):  MySQL -- 
 Summary(zh_CN):        MySQLÊý¾Ý¿â·þÎñÆ÷
 Name:          mysql
 Group:         Applications/Databases
-Version:       3.23.49
-Release:       6
+Version:       3.23.52
+Release:       1
 License:       GPL/LGPL
 Source0:       http://prdownloads.sourceforge.net/mysql/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
@@ -26,6 +26,7 @@ Patch4:               %{name}-amfix.patch
 Patch5:                %{name}-acfix.patch
 Patch6:                %{name}-am15.patch
 Patch7:                %{name}-c++.patch
+Patch8:                %{name}-noproc.patch
 Icon:          mysql.gif
 URL:           http://www.mysql.com/
 Requires:      %{name}-libs = %{version}
@@ -50,7 +51,7 @@ Obsoletes:    mysql-server
 
 %define                _libexecdir     %{_sbindir}
 %define                _localstatedir  /var/lib/mysql
-%define                _gcc_ver        %(%{__cc} --version | cut -b 1)
+%define                _gcc_ver        %(%{__cc} -dumpversion | cut -b 1)
 %if %{_gcc_ver} == 2
 %define                __cxx           "%{__cc}"
 %endif
@@ -152,7 +153,9 @@ Summary:    MySQL additional utilities written in Perl
 Summary(pl):   Dodatkowe narzêdzia do MySQL napisane w Perlu
 Group:         Applications/Databases
 Requires:      %{name}-extras = %{version}
-Requires:      perl-Msql-Mysql-modules
+Requires:      perl(DBD::mysql)
+
+%define                _noautoreqdep   "perl(DBD::mysql)"
 
 %description extras-perl
 MySQL additional utilities written in Perl.
@@ -296,13 +299,14 @@ MySQL.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 rm -f missing
-libtoolize --copy --force
+%{__libtoolize}
 aclocal
-automake -a -c -f
-autoconf
+%{__automake}
+%{__autoconf}
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions -fomit-frame-pointer"
 CFLAGS="%{rpmcflags} -fomit-frame-pointer"
 %configure \
@@ -324,7 +328,7 @@ CFLAGS="%{rpmcflags} -fomit-frame-pointer"
        --without-readline \
        --without-docs \
        --with-low-memory  \
-       --with-comment="Polish Linux Distribution MySQL RPM"
+       --with-comment="PLD Linux Distribution MySQL RPM"
 
 %{__make} benchdir=$RPM_BUILD_ROOT%{_datadir}/sql-bench
 %{__make} -C Docs mysql.info
@@ -414,12 +418,14 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/mysqld.conf
 %attr(755,root,root) %{_bindir}/isamchk
 %attr(755,root,root) %{_bindir}/isamlog
-%attr(755,root,root) %{_bindir}/mysqlbug
 %attr(755,root,root) %{_bindir}/myisamchk
 %attr(755,root,root) %{_bindir}/myisamlog
 %attr(755,root,root) %{_bindir}/myisampack
 %attr(755,root,root) %{_bindir}/pack_isam
 %attr(755,root,root) %{_sbindir}/mysqld
+%{_mandir}/man1/isamchk.1*
+%{_mandir}/man1/isamlog.1*
+%{_mandir}/man1/mysqld.1*
 
 %attr(751,mysql,mysql) /var/lib/mysql
 %attr(750,mysql,mysql) %dir /var/log/mysql
@@ -432,24 +438,25 @@ fi
 %{_datadir}/mysql/english
 %lang(cs) %{_datadir}/mysql/czech
 %lang(da) %{_datadir}/mysql/danish
-%lang(nl) %{_datadir}/mysql/dutch
-%lang(et) %{_datadir}/mysql/estonian
-%lang(fr) %{_datadir}/mysql/french
 %lang(de) %{_datadir}/mysql/german
 %lang(el) %{_datadir}/mysql/greek
+%lang(es) %{_datadir}/mysql/spanish
+%lang(et) %{_datadir}/mysql/estonian
+%lang(fr) %{_datadir}/mysql/french
 %lang(hu) %{_datadir}/mysql/hungarian
 %lang(it) %{_datadir}/mysql/italian
 %lang(ja) %{_datadir}/mysql/japanese
 %lang(ko) %{_datadir}/mysql/korean
-%lang(no) %{_datadir}/mysql/norwegian
+%lang(nl) %{_datadir}/mysql/dutch
 %lang(nn) %{_datadir}/mysql/norwegian-ny
+%lang(no) %{_datadir}/mysql/norwegian
 %lang(pl) %{_datadir}/mysql/polish
 %lang(pt) %{_datadir}/mysql/portuguese
 %lang(ro) %{_datadir}/mysql/romanian
 %lang(ru) %{_datadir}/mysql/russian
 %lang(sk) %{_datadir}/mysql/slovak
-%lang(es) %{_datadir}/mysql/spanish
 %lang(sv) %{_datadir}/mysql/swedish
+%lang(uk) %{_datadir}/mysql/ukrainian
 
 %files extras
 %defattr(644,root,root,755)
@@ -460,6 +467,8 @@ fi
 %attr(755,root,root) %{_bindir}/my_print_defaults
 %attr(755,root,root) %{_bindir}/replace
 %attr(755,root,root) %{_bindir}/resolveip
+%{_mandir}/man1/perror.1*
+%{_mandir}/man1/replace.1*
 
 %files extras-perl
 %defattr(644,root,root,755)
@@ -470,21 +479,26 @@ fi
 %attr(755,root,root) %{_bindir}/mysql_zap
 %attr(755,root,root) %{_bindir}/mysql_find_rows
 %attr(755,root,root) %{_bindir}/mysqlaccess
+%{_mandir}/man1/mysql_zap.1*
+%{_mandir}/man1/mysqlaccess.1*
 
 %files client
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mysql
-%attr(755,root,root) %{_bindir}/mysqlbug
 %attr(755,root,root) %{_bindir}/mysqldump
 %attr(755,root,root) %{_bindir}/mysqlimport
 %attr(755,root,root) %{_bindir}/mysqlshow
 %attr(755,root,root) %{_bindir}/mysqlbinlog
 %attr(755,root,root) %{_bindir}/mysqladmin
 %{_mandir}/man1/mysql.1*
+%{_mandir}/man1/mysqladmin.1*
+%{_mandir}/man1/mysqldump.1*
+%{_mandir}/man1/mysqlshow.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_bindir}/mysqlbug
 
 %files devel
 %defattr(644,root,root,755)