Remove static libraries, also fix %define problem

This commit is contained in:
Tom Lane 2010-01-05 17:39:43 +00:00 committed by Michal Schorm
parent 5ed0e377ad
commit 70c7e74c92

View File

@ -1,6 +1,6 @@
Name: mysql
Version: 5.1.42
Release: 2%{?dist}
Release: 3%{?dist}
Summary: MySQL client programs and shared libraries
Group: Applications/Databases
URL: http://www.mysql.com
@ -9,7 +9,7 @@ URL: http://www.mysql.com
License: GPLv2 with exceptions
# Regression tests take a long time, you can skip 'em with this
%{!?runselftest:%define runselftest 1}
%{!?runselftest:%global runselftest 1}
Source0: http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-%{version}.tar.gz
Source1: mysql.init
@ -51,7 +51,7 @@ Conflicts: MySQL
Obsoletes: mysql-client mysql-perl
# Working around perl dependency checking bug in rpm FTTB. Remove later.
%define __perl_requires %{SOURCE999}
%global __perl_requires %{SOURCE999}
%description
MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
@ -323,6 +323,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_bin_dist.1*
rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1*
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libndbclient.la
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/*.a
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.la
rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.a
rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
@ -624,7 +625,6 @@ fi
%defattr(-,root,root)
/usr/include/mysql
/usr/share/aclocal/mysql.m4
%{_libdir}/mysql/*.a
%{_libdir}/mysql/libmysqlclient*.so
%{_libdir}/mysql/libndbclient.so
@ -652,6 +652,10 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
* Tue Jan 5 2010 Tom Lane <tgl@redhat.com> 5.1.42-3
- Remove static libraries (.a files) from package, per packaging guidelines
- Change %%define to %%global, per packaging guidelines
* Sat Jan 2 2010 Tom Lane <tgl@redhat.com> 5.1.42-2
- Disable building the innodb plugin; it tickles assorted gcc bugs and
doesn't seem entirely ready for prime time anyway.