diff --git a/.cvsignore b/.cvsignore index 44652d5..b2d772c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-3.23.52.tar.bz2 +mysql-3.23.54a.tar.bz2 diff --git a/mysql-errno.patch b/mysql-errno.patch new file mode 100644 index 0000000..e452926 --- /dev/null +++ b/mysql-errno.patch @@ -0,0 +1,13 @@ +--- mysql-3.23.52/include/global.h.jj 2002-08-13 18:08:16.000000000 -0400 ++++ mysql-3.23.52/include/global.h 2002-11-18 18:35:10.000000000 -0500 +@@ -58,6 +58,10 @@ + #define _GNU_SOURCE 1 + #endif + ++#ifdef __linux__ ++#define HAVE_ERRNO_AS_DEFINE ++#endif ++ + /* The client defines this to avoid all thread code */ + #if defined(UNDEF_THREADS_HACK) + #undef THREAD diff --git a/mysql.spec b/mysql.spec index b1c4714..e299e29 100644 --- a/mysql.spec +++ b/mysql.spec @@ -1,6 +1,6 @@ Name: mysql -Version: 3.23.52 -Release: 3 +Version: 3.23.54a +Release: 4 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.bz2 Source1: mysql.init Source2: mysql.logrotate @@ -8,6 +8,7 @@ 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 +Patch2: mysql-errno.patch URL: http://www.mysql.com BuildRoot: %{_tmppath}/%{name}-%{version}-root Summary: MySQL client programs and shared library. @@ -38,7 +39,7 @@ generic MySQL files. Summary: The MySQL server and related files. License: GPL Group: Applications/Databases -Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel +Prereq: /sbin/chkconfig, /usr/sbin/useradd Requires: mysql = %{version}, sh-utils Conflicts: MySQL-server @@ -66,6 +67,7 @@ developing MySQL applications. %setup -q %patch0 -p1 +%patch2 -p1 %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" @@ -97,7 +99,7 @@ export CFLAGS CXXFLAGS make make check -%ifnarch s390 s390x +%ifnarch s390 s390x x86_64 make test %endif @@ -115,7 +117,6 @@ 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 - mkdir -p $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d} mkdir -p $RPM_BUILD_ROOT/var/run/mysqld install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql @@ -126,7 +127,14 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir* # Doesn't contain anything 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 %clean rm -rf $RPM_BUILD_ROOT @@ -135,13 +143,13 @@ rm -rf $RPM_BUILD_ROOT /usr/sbin/useradd -M -o -r -d /var/lib/mysql -s /bin/bash \ -c "MySQL Server" -u 27 mysql > /dev/null 2>&1 || : -%post +%post /sbin/install-info %{_infodir}/mysql.info.gz %{_infodir}/dir -if ! grep '^/usr/lib/mysql$' /etc/ld.so.conf > /dev/null 2>&1 +if ! grep '^%{_libdir}/mysql$' /etc/ld.so.conf > /dev/null 2>&1 then - echo "/usr/lib/mysql" >> /etc/ld.so.conf + echo "%{_libdir}/mysql" >> /etc/ld.so.conf fi -/sbin/ldconfig /usr/lib/mysql +/sbin/ldconfig %{_libdir}/mysql %post server if [ $1 = 1 ]; then @@ -162,13 +170,13 @@ fi %postun if [ $1 = 0 ] ; then - if grep '^/usr/lib/mysql$' /etc/ld.so.conf > /dev/null 2>&1 + if grep '^%{_libdir}/mysql$' /etc/ld.so.conf > /dev/null 2>&1 then - grep -v '^/usr/lib/mysql$' /etc/ld.so.conf \ + grep -v '^%{_libdir}/mysql$' /etc/ld.so.conf \ > /etc/ld.so.conf.$$ 2> /dev/null mv /etc/ld.so.conf.$$ /etc/ld.so.conf fi - /sbin/ldconfig /usr/lib/mysql + /sbin/ldconfig %{_libdir}/mysql fi @@ -195,8 +203,8 @@ fi %{_infodir}/* %{_mandir}/man1/* -%dir /usr/lib/mysql -/usr/lib/mysql/libmysqlclient*.so.* +%dir %{_libdir}/mysql +%{_libdir}/mysql/libmysqlclient*.so.* %dir /usr/share/mysql /usr/share/mysql/english @@ -206,6 +214,7 @@ fi %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 @@ -238,11 +247,28 @@ fi %files devel %defattr(-,root,root) /usr/include/mysql -%dir /usr/lib/mysql -/usr/lib/mysql/*.a -/usr/lib/mysql/libmysqlclient*.so +%dir %{_libdir}/mysql +%{_libdir}/mysql/*.a +%{_libdir}/mysql/libmysqlclient*.so %changelog +* Mon Dec 16 2002 Joe Orton 3.23.54a-4 +- upgrade to 3.23.54a for safe_mysqld fix + +* Thu Dec 12 2002 Joe Orton 3.23.54-3 +- upgrade to 3.23.54 for latest security fixes + +* Tue Nov 19 2002 Jakub Jelinek 3.23.52-5 +- Always include for errno +- Remove unpackaged files + +* Tue Nov 12 2002 Florian La Roche +- do not prereq userdel, not used at all + +* Mon Sep 9 2002 Trond Eivind Glomsrød 3.23.52-4 +- Use %%{_libdir} +- Add patch for x86-64 + * Wed Sep 4 2002 Jakub Jelinek 3.23.52-3 - rebuilt with gcc-3.2-7 diff --git a/sources b/sources index 54079fb..4f1ed00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72c797333c1258822fe972273b078320 mysql-3.23.52.tar.bz2 +65eb882b21101c8bc3f0c212bd8049d1 mysql-3.23.54a.tar.bz2