From 5af4972e6fa6cc8b3451a36bbe9ac287c44283a1 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 09:00:15 +0000 Subject: [PATCH] auto-import changelog data from mysql-3.23.54a-11.src.rpm Tue Feb 18 2003 Patrick Macdonald 3.23.54a-11 - enable thread safe client - add patch for double free fix Wed Jan 22 2003 Tim Powers - rebuilt Mon Jan 13 2003 Karsten Hopp 3.23.54a-9 - disable checks on s390x Sat Jan 04 2003 Jeff Johnson 3.23.54a-8 - use internal dep generator. Wed Jan 01 2003 Bill Nottingham 3.23.54a-7 - fix mysql_config on hammer Sun Dec 22 2002 Tim Powers 3.23.54a-6 - don't use rpms internal dep generator Tue Dec 17 2002 Elliot Lee 3.23.54a-5 - Push it into the build system --- filter-requires-mysql.sh | 2 +- mysql.spec | 146 ++++++++++++++++++++++++--------------- 2 files changed, 92 insertions(+), 56 deletions(-) diff --git a/filter-requires-mysql.sh b/filter-requires-mysql.sh index f430ee8..ff04055 100755 --- a/filter-requires-mysql.sh +++ b/filter-requires-mysql.sh @@ -1,3 +1,3 @@ #!/bin/sh -/usr/lib/rpm/find-requires $* | grep -v "perl(the" +/usr/lib/rpm/perl.req $* | grep -v "perl(the" diff --git a/mysql.spec b/mysql.spec index e299e29..1836634 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql Version: 3.23.54a -Release: 4 +Release: 11 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.bz2 Source1: mysql.init Source2: mysql.logrotate @@ -8,7 +8,9 @@ Source3: my.cnf # Working around perl dependency checking bug in rpm FTTB. Remove later. Source999: filter-requires-mysql.sh Patch0: mysql-3.23.51-manfixes.patch +Patch1: mysql-3.23.54-libdir.patch Patch2: mysql-errno.patch +Patch3: mysql-3.23.54a-doublefree.patch URL: http://www.mysql.com BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: MySQL client programs and shared library. @@ -17,15 +19,14 @@ Group: Applications/Databases Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig BuildRequires: gperf, perl, readline-devel BuildRequires: gcc-c++, ncurses-devel, zlib-devel +BuildRequires: libtool automake autoconf Requires: bash Conflicts: MySQL Requires: perl-DBI, perl-DBD-MySQL Obsoletes: mysql-client mysql-bench mysql-perl -ExcludeArch: alpha # Working around perl dependency checking bug in rpm FTTB. Remove later. -%define __find_requires %{SOURCE999} - +%define __perl_requires %{SOURCE999} %description MySQL is a multi-user, multi-threaded SQL database server. MySQL is a @@ -67,17 +68,31 @@ developing MySQL applications. %setup -q %patch0 -p1 +%patch1 -p1 %patch2 -p1 +%patch3 -p1 + +libtoolize --force +aclocal +automake +autoconf +autoheader + %build CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" -CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-rtti -fno-exceptions" +%ifarch alpha +# Can't link C++ objects into an executable without this. Odd! +# -ECL 2002-12-19 +CFLAGS="$CFLAGS -fPIC" +%endif +CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions" export CFLAGS CXXFLAGS #CPPFLAGS="$CFLAGS" #export CPPFLAGS #configure --without-debug \ -./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} \ +%configure \ --without-readline \ --without-debug \ --enable-shared \ @@ -90,16 +105,15 @@ export CFLAGS CXXFLAGS --with-innodb \ --enable-local-infile \ --enable-large-files=yes --enable-largefile=yes \ -%ifnarch alpha ppc - --with-berkeley-db \ -%endif - --with-thread-safe-client + --with-berkeley-db-includes=%{_includedir} \ + --with-berkeley-db-libs=%{_libdir} \ + --enable-thread-safe-client # Not enabling assembler -make +make %{?_smp_mflags} make check -%ifnarch s390 s390x x86_64 +%ifnarch ppc alpha s390x make test %endif @@ -113,9 +127,9 @@ touch $RPM_BUILD_ROOT/var/log/mysqld.log # List the installed tree for RPM package maintenance purposes. find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES -gzip $RPM_BUILD_ROOT/%{_infodir}/* -rm -f $RPM_BUILD_ROOT/usr/share/mysql/mysql-*.spec -rm -f $RPM_BUILD_ROOT/usr/share/mysql/mysql-log-rotate +gzip ${RPM_BUILD_ROOT}%{_infodir}/* +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate mkdir -p $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d} mkdir -p $RPM_BUILD_ROOT/var/run/mysqld @@ -129,12 +143,12 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir* rm -f Docs/manual.ps rm -fr $RPM_BUILD_ROOT/usr/sql-bench rm -fr $RPM_BUILD_ROOT/usr/mysql-test -rm -f $RPM_BUILD_ROOT/%{_libdir}/mysql/libmysqlclient.la -rm -f $RPM_BUILD_ROOT/usr/share/mysql/binary-configure -rm -f $RPM_BUILD_ROOT/usr/share/mysql/make_binary_distribution -rm -f $RPM_BUILD_ROOT/usr/share/mysql/mi_test_all* -rm -f $RPM_BUILD_ROOT/usr/share/mysql/*.cnf -rm -f $RPM_BUILD_ROOT/usr/share/mysql/mysql.server +rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mi_test_all* +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/*.cnf +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server %clean rm -rf $RPM_BUILD_ROOT @@ -192,51 +206,51 @@ fi %doc Docs/manual* Docs/mysqld_error.txt # /usr/bin/* except mysqladmin and safe_mysqld -/usr/bin/[a-ln-rt-z]* -/usr/bin/msql2mysql -/usr/bin/mysql -/usr/bin/mysql_* -/usr/bin/mysqlaccess -/usr/bin/mysql[b-z]* -/usr/bin/my_* -/usr/bin/myisam* +%{_bindir}/[a-ln-rt-z]* +%{_bindir}/msql2mysql +%{_bindir}/mysql +%{_bindir}/mysql_* +%{_bindir}/mysqlaccess +%{_bindir}/mysql[b-z]* +%{_bindir}/my_* +%{_bindir}/myisam* %{_infodir}/* %{_mandir}/man1/* %dir %{_libdir}/mysql %{_libdir}/mysql/libmysqlclient*.so.* -%dir /usr/share/mysql -/usr/share/mysql/english -%lang(cs) /usr/share/mysql/czech -%lang(da) /usr/share/mysql/danish -%lang(nl) /usr/share/mysql/dutch -%lang(et) /usr/share/mysql/estonian -%lang(fr) /usr/share/mysql/french -%lang(de) /usr/share/mysql/german -%lang(el) /usr/share/mysql/greek -%lang(hu) /usr/share/mysql/hungarian -%lang(it) /usr/share/mysql/italian -%lang(ja) /usr/share/mysql/japanese -%lang(ko) /usr/share/mysql/korean -%lang(no) /usr/share/mysql/norwegian -%lang(no) /usr/share/mysql/norwegian-ny -%lang(pl) /usr/share/mysql/polish -%lang(pt) /usr/share/mysql/portuguese -%lang(ro) /usr/share/mysql/romanian -%lang(ru) /usr/share/mysql/russian -%lang(sk) /usr/share/mysql/slovak -%lang(es) /usr/share/mysql/spanish -%lang(sv) /usr/share/mysql/swedish -%lang(uk) /usr/share/mysql/ukrainian -/usr/share/mysql/charsets +%dir %{_datadir}/mysql +%{_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(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(no) %{_datadir}/mysql/norwegian-ny +%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 +%{_datadir}/mysql/charsets %config(noreplace) /etc/my.cnf %files server %defattr(-,root,root) %doc support-files/*.cnf -/usr/bin/mysqladmin -/usr/bin/safe_mysqld +%{_bindir}/mysqladmin +%{_bindir}/safe_mysqld /usr/libexec/* /etc/rc.d/init.d/mysqld %attr(0755,mysql,mysql) %dir /var/run/mysqld @@ -252,6 +266,28 @@ fi %{_libdir}/mysql/libmysqlclient*.so %changelog +* Tue Feb 18 2003 Patrick Macdonald 3.23.54a-11 +- enable thread safe client +- add patch for double free fix + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Jan 13 2003 Karsten Hopp 3.23.54a-9 +- disable checks on s390x + +* Sat Jan 4 2003 Jeff Johnson 3.23.54a-8 +- use internal dep generator. + +* Wed Jan 1 2003 Bill Nottingham 3.23.54a-7 +- fix mysql_config on hammer + +* Sun Dec 22 2002 Tim Powers 3.23.54a-6 +- don't use rpms internal dep generator + +* Tue Dec 17 2002 Elliot Lee 3.23.54a-5 +- Push it into the build system + * Mon Dec 16 2002 Joe Orton 3.23.54a-4 - upgrade to 3.23.54a for safe_mysqld fix