auto-import changelog data from mysql-3.23.54a-4.src.rpm
Mon Dec 16 2002 Joe Orton <jorton@redhat.com> 3.23.54a-4 - upgrade to 3.23.54a for safe_mysqld fix Thu Dec 12 2002 Joe Orton <jorton@redhat.com> 3.23.54-3 - upgrade to 3.23.54 for latest security fixes Tue Nov 19 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-5 - Always include <errno.h> for errno - Remove unpackaged files Tue Nov 12 2002 Florian La Roche <Florian.LaRoche@redhat.de> - do not prereq userdel, not used at all Mon Sep 09 2002 Trond Eivind Glomsrød <teg@redhat.com> 3.23.52-4 - Use %{_libdir} - Add patch for x86-64
This commit is contained in:
parent
83f6843bf2
commit
a1ede3ac06
@ -1 +1 @@
|
|||||||
mysql-3.23.52.tar.bz2
|
mysql-3.23.54a.tar.bz2
|
||||||
|
13
mysql-errno.patch
Normal file
13
mysql-errno.patch
Normal file
@ -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
|
62
mysql.spec
62
mysql.spec
@ -1,6 +1,6 @@
|
|||||||
Name: mysql
|
Name: mysql
|
||||||
Version: 3.23.52
|
Version: 3.23.54a
|
||||||
Release: 3
|
Release: 4
|
||||||
Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.bz2
|
Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.bz2
|
||||||
Source1: mysql.init
|
Source1: mysql.init
|
||||||
Source2: mysql.logrotate
|
Source2: mysql.logrotate
|
||||||
@ -8,6 +8,7 @@ Source3: my.cnf
|
|||||||
# Working around perl dependency checking bug in rpm FTTB. Remove later.
|
# Working around perl dependency checking bug in rpm FTTB. Remove later.
|
||||||
Source999: filter-requires-mysql.sh
|
Source999: filter-requires-mysql.sh
|
||||||
Patch0: mysql-3.23.51-manfixes.patch
|
Patch0: mysql-3.23.51-manfixes.patch
|
||||||
|
Patch2: mysql-errno.patch
|
||||||
URL: http://www.mysql.com
|
URL: http://www.mysql.com
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||||
Summary: MySQL client programs and shared library.
|
Summary: MySQL client programs and shared library.
|
||||||
@ -38,7 +39,7 @@ generic MySQL files.
|
|||||||
Summary: The MySQL server and related files.
|
Summary: The MySQL server and related files.
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel
|
Prereq: /sbin/chkconfig, /usr/sbin/useradd
|
||||||
Requires: mysql = %{version}, sh-utils
|
Requires: mysql = %{version}, sh-utils
|
||||||
Conflicts: MySQL-server
|
Conflicts: MySQL-server
|
||||||
|
|
||||||
@ -66,6 +67,7 @@ developing MySQL applications.
|
|||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%patch2 -p1
|
||||||
%build
|
%build
|
||||||
CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
|
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"
|
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
|
||||||
make check
|
make check
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x x86_64
|
||||||
make test
|
make test
|
||||||
%endif
|
%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-*.spec
|
||||||
rm -f $RPM_BUILD_ROOT/usr/share/mysql/mysql-log-rotate
|
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/etc/{rc.d/init.d,logrotate.d}
|
||||||
mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
|
mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
|
||||||
install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
|
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
|
# Doesn't contain anything
|
||||||
rm -f Docs/manual.ps
|
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
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
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 \
|
/usr/sbin/useradd -M -o -r -d /var/lib/mysql -s /bin/bash \
|
||||||
-c "MySQL Server" -u 27 mysql > /dev/null 2>&1 || :
|
-c "MySQL Server" -u 27 mysql > /dev/null 2>&1 || :
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/install-info %{_infodir}/mysql.info.gz %{_infodir}/dir
|
/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
|
then
|
||||||
echo "/usr/lib/mysql" >> /etc/ld.so.conf
|
echo "%{_libdir}/mysql" >> /etc/ld.so.conf
|
||||||
fi
|
fi
|
||||||
/sbin/ldconfig /usr/lib/mysql
|
/sbin/ldconfig %{_libdir}/mysql
|
||||||
|
|
||||||
%post server
|
%post server
|
||||||
if [ $1 = 1 ]; then
|
if [ $1 = 1 ]; then
|
||||||
@ -162,13 +170,13 @@ fi
|
|||||||
|
|
||||||
%postun
|
%postun
|
||||||
if [ $1 = 0 ] ; then
|
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
|
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
|
> /etc/ld.so.conf.$$ 2> /dev/null
|
||||||
mv /etc/ld.so.conf.$$ /etc/ld.so.conf
|
mv /etc/ld.so.conf.$$ /etc/ld.so.conf
|
||||||
fi
|
fi
|
||||||
/sbin/ldconfig /usr/lib/mysql
|
/sbin/ldconfig %{_libdir}/mysql
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -195,8 +203,8 @@ fi
|
|||||||
|
|
||||||
%{_infodir}/*
|
%{_infodir}/*
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%dir /usr/lib/mysql
|
%dir %{_libdir}/mysql
|
||||||
/usr/lib/mysql/libmysqlclient*.so.*
|
%{_libdir}/mysql/libmysqlclient*.so.*
|
||||||
|
|
||||||
%dir /usr/share/mysql
|
%dir /usr/share/mysql
|
||||||
/usr/share/mysql/english
|
/usr/share/mysql/english
|
||||||
@ -206,6 +214,7 @@ fi
|
|||||||
%lang(et) /usr/share/mysql/estonian
|
%lang(et) /usr/share/mysql/estonian
|
||||||
%lang(fr) /usr/share/mysql/french
|
%lang(fr) /usr/share/mysql/french
|
||||||
%lang(de) /usr/share/mysql/german
|
%lang(de) /usr/share/mysql/german
|
||||||
|
%lang(el) /usr/share/mysql/greek
|
||||||
%lang(hu) /usr/share/mysql/hungarian
|
%lang(hu) /usr/share/mysql/hungarian
|
||||||
%lang(it) /usr/share/mysql/italian
|
%lang(it) /usr/share/mysql/italian
|
||||||
%lang(ja) /usr/share/mysql/japanese
|
%lang(ja) /usr/share/mysql/japanese
|
||||||
@ -238,11 +247,28 @@ fi
|
|||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
/usr/include/mysql
|
/usr/include/mysql
|
||||||
%dir /usr/lib/mysql
|
%dir %{_libdir}/mysql
|
||||||
/usr/lib/mysql/*.a
|
%{_libdir}/mysql/*.a
|
||||||
/usr/lib/mysql/libmysqlclient*.so
|
%{_libdir}/mysql/libmysqlclient*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 16 2002 Joe Orton <jorton@redhat.com> 3.23.54a-4
|
||||||
|
- upgrade to 3.23.54a for safe_mysqld fix
|
||||||
|
|
||||||
|
* Thu Dec 12 2002 Joe Orton <jorton@redhat.com> 3.23.54-3
|
||||||
|
- upgrade to 3.23.54 for latest security fixes
|
||||||
|
|
||||||
|
* Tue Nov 19 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-5
|
||||||
|
- Always include <errno.h> for errno
|
||||||
|
- Remove unpackaged files
|
||||||
|
|
||||||
|
* Tue Nov 12 2002 Florian La Roche <Florian.LaRoche@redhat.de>
|
||||||
|
- do not prereq userdel, not used at all
|
||||||
|
|
||||||
|
* Mon Sep 9 2002 Trond Eivind Glomsrød <teg@redhat.com> 3.23.52-4
|
||||||
|
- Use %%{_libdir}
|
||||||
|
- Add patch for x86-64
|
||||||
|
|
||||||
* Wed Sep 4 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-3
|
* Wed Sep 4 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-3
|
||||||
- rebuilt with gcc-3.2-7
|
- rebuilt with gcc-3.2-7
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user