|
|
Author: tgl
Update of /cvs/dist/rpms/mysqlclient10/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24343
Modified Files:
mysqlclient10.spec
Added Files:
my_config.h
Log Message:
Fix multilib issues in -devel RPM; add overlooked licensing docs.
--- NEW FILE my_config.h ---
/*
* Kluge to support multilib installation of both 32- and 64-bit RPMS:
* we need to arrange that header files that appear in both RPMs are
* identical. Hence, this file is architecture-independent and calls
* in an arch-dependent file that will appear in just one RPM.
*
* Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway.
*/
#ifdef __i386__
#include "my_config_i386.h"
#endif
#ifdef __x86_64__
#include "my_config_x86_64.h"
#endif
#ifdef __ia64__
#include "my_config_ia64.h"
#endif
#ifdef __ppc__
#include "my_config_ppc.h"
#endif
#ifdef __ppc64__
#include "my_config_ppc64.h"
#endif
#ifdef __s390__
#include "my_config_s390.h"
#endif
#ifdef __s390x__
#include "my_config_s390x.h"
#endif
Index: mysqlclient10.spec
===================================================================
RCS file: /cvs/dist/rpms/mysqlclient10/devel/mysqlclient10.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mysqlclient10.spec 8 Apr 2005 23:32:40 -0000 1.7
+++ mysqlclient10.spec 15 Dec 2005 00:00:02 -0000 1.8
@@ -1,7 +1,13 @@
Name: mysqlclient10
Version: 3.23.58
-Release: 6
+Release: 7
+Summary: Backlevel MySQL shared libraries.
+License: LGPL
+Group: Applications/Databases
+URL: http://www.mysql.com
+
Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.gz
+Source5: my_config.h
# Working around perl dependency checking bug in rpm FTTB. Remove later.
Source999: filter-requires-mysql.sh
Patch1: mysql-3.23.54-libdir.patch
@@ -9,11 +15,7 @@
Patch8: mysql-3.23.58-config.patch
Patch9: mysql-3.23.58-security.patch
Patch10: mysql-no-atomic.patch
-URL: http://www.mysql.com
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Summary: Backlevel MySQL shared libraries.
-License: LGPL
-Group: Applications/Databases
Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig
BuildRequires: gperf, perl, readline-devel
BuildRequires: gcc-c++, ncurses-devel, zlib-devel
@@ -63,7 +65,7 @@
%build
CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
-CFLAGS="$CFLAGS -fno-strict-aliasing"
+CFLAGS="$CFLAGS -fno-strict-aliasing -fwrapv"
%ifarch alpha
# Can't link C++ objects into an executable without this. Odd!
# -ECL 2002-12-19
@@ -95,6 +97,9 @@
%makeinstall
+install -m 644 include/my_config.h
$RPM_BUILD_ROOT%{_includedir}/mysql/my_config_`uname -m`.h
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_includedir}/mysql/
+
# We want the .so files both in regular _libdir (for execution) and
# in special _libdir/mysql3 directory (for convenient building of clients).
# The ones in the latter directory should be just symlinks though.
@@ -133,6 +138,8 @@
%files
%defattr(-,root,root)
+%doc README COPYING COPYING.LIB
+
%{_origlibdir}/mysql/libmysqlclient*.so.*
/etc/ld.so.conf.d/*
@@ -142,6 +149,12 @@
%{_libdir}
%changelog
+* Wed Dec 14 2005 Tom Lane <tgl@xxxxxxxxxx> 3.23.58-7
+- Make my_config.h architecture-independent for multilib installs;
+ put the original my_config.h into my_config_$ARCH.h
+- Add license info (COPYING, COPYING.LIB) to the shipped documentation
+- Add -fwrapv to CFLAGS so that gcc 4.1 doesn't break it
+
* Fri Apr 8 2005 Tom Lane <tgl@xxxxxxxxxx> 3.23.58-6
- Avoid dependency on <asm/atomic.h>, cause it won't build anymore on ia64.
- Override configure thread library test to suppress HAVE_LINUXTHREADS check
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|