Hello community, here is the log from the commit of package mysql checked in at Fri Nov 9 00:36:21 CET 2007. -------- --- mysql/mysql.changes 2007-08-31 13:48:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql/mysql.changes 2007-11-08 13:40:34.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 8 13:39:51 CET 2007 - mmarek@suse.cz + +- avoid using distributed pregenerated files instead of + files generated in the builddirs + +------------------------------------------------------------------- Old: ---- minmem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql.spec ++++++ --- /var/tmp/diff_new_pack.k28330/_old 2007-11-09 00:33:15.000000000 +0100 +++ /var/tmp/diff_new_pack.k28330/_new 2007-11-09 00:33:15.000000000 +0100 @@ -12,14 +12,14 @@ Name: mysql BuildRequires: gcc-c++ ncurses-devel openssl-devel procps pwdutils readline-devel tcpd-devel zlib-devel -License: GPL v2 only, individual distribution permission before version 3.23.xx +License: GPL v2 only Group: Productivity/Databases/Servers Version: 5.0.45 -Release: 14 +Release: 32 # required by rcmysql Requires: mysql-client = %{version} -Autoreqprov: on -URL: http://www.mysql.com +AutoReqProv: on +Url: http://www.mysql.com Summary: A True Multiuser, Multithreaded SQL Database Server PreReq: /usr/sbin/useradd /usr/sbin/groupadd fileutils %install_info_prereq %fillup_prereq %insserv_prereq Source: mysql-%{version}.tar.bz2 @@ -77,11 +77,11 @@ Provides: mysql-devel = %{version}-%{release} Obsoletes: mysql-devel <= 5.0.26 Requires: libmysqlclient15 = %{version} libmysqlclient_r15 = %{version} glibc-devel zlib-devel openssl-devel -License: GPL v2 or later, See package "mysql" for more info +License: GPL v2 only; with additional permissions: EXCEPTIONS-CLIENT Summary: MySQL Development Header Files and Libraries -URL: http://www.mysql.com +Url: http://www.mysql.com Group: Development/Libraries/C and C++ -Autoreqprov: on +AutoReqProv: on %description -n libmysqlclient-devel This package contains the development header files and libraries @@ -97,9 +97,9 @@ %package client License: GPL v2 or later Summary: MySQL Client -URL: http://www.mysql.com +Url: http://www.mysql.com Group: Productivity/Databases/Clients -Autoreqprov: on +AutoReqProv: on %description client This package contains the standard MySQL clients. @@ -113,11 +113,11 @@ %package bench Requires: mysql-client perl-DBD-mysql -License: LGPL v2 or later, individual distribution permission before version 3.23.xx +License: LGPL v2.1 or later Summary: MySQL - Benchmarks -URL: http://www.mysql.com +Url: http://www.mysql.com Group: Productivity/Databases/Tools -Autoreqprov: on +AutoReqProv: on %description bench This package contains MySQL benchmark scripts and data. @@ -134,8 +134,8 @@ %package -n libmysqlclient15 Summary: MySQL Shared Libraries -License: GPL v2 or later -URL: http://www.mysql.com +License: GPL v2 only; with additional permissions: EXCEPTIONS-CLIENT +Url: http://www.mysql.com Group: Development/Libraries/Other # make sure libmysqlclient15 replaces the 5.0.x versions of mysql-shared, # but can coexist with 4.x versions of mysql-shared @@ -143,7 +143,7 @@ # *** this has to be removed when the package name changes *** Provides: mysql-shared = %version Obsoletes: mysql-shared >= 5.0 -Autoreqprov: on +AutoReqProv: on %description -n libmysqlclient15 This package contains the shared libraries (.so) which certain @@ -158,10 +158,10 @@ %package -n libmysqlclient_r15 Summary: MySQL Shared Libraries -License: GPL v2 or later -URL: http://www.mysql.com +License: GPL v2 only; with additional permissions: EXCEPTIONS-CLIENT +Url: http://www.mysql.com Group: Development/Libraries/Other -Autoreqprov: on +AutoReqProv: on %description -n libmysqlclient_r15 This package contains the shared libraries (.so) which certain @@ -177,10 +177,10 @@ %package Max Summary: MySQL - Server with Berkeley DB License: GPL v2 or later -URL: http://www.mysql.com +Url: http://www.mysql.com Group: Productivity/Databases/Servers Requires: mysql = %{version} -Autoreqprov: on +AutoReqProv: on %description Max An optional MySQL server binary that supports features such as @@ -197,7 +197,7 @@ %package debug Summary: MySQL server with debug options turned on License: GPL v2 or later -URL: http://www.mysql.com +Url: http://www.mysql.com Group: Productivity/Databases/Servers Requires: mysql = %{version} @@ -218,10 +218,10 @@ %package test Summary: MySQL testsuite License: GPL v2 or later -URL: http://www.mysql.com +Url: http://www.mysql.com Group: Productivity/Databases/Servers Requires: mysql = %{version} mysql-client = %{version} perl-DBD-mysql -Autoreqprov: on +AutoReqProv: on %description test This package contains the MySQL test scripts and data. @@ -242,7 +242,7 @@ Requires: perl-DBD-mysql # make sure this package is installed when updating from 10.2 and older Provides: mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror -Autoreqprov: on +AutoReqProv: on %description tools A set of scripts for administering a MySQL server or developing @@ -273,6 +273,9 @@ # remove unneeded man manpages rm man/mysqlman.1 man/safe_mysqld.1 man/mysql.server.1 man/make_win_*.1 rm man/mysqlmanager-pwgen.1 man/mysqlmanagerc.1 +# these are generated in the builddir, remove the pregenerated files to +# avoid accidentaly using them +rm innobase/ib_config.h scripts/mysqlbug bdb/Makefile %build %if 0%{?suse_version} < 1000 @@ -347,6 +350,24 @@ --with-innodb \ --with-embedded-server \ --with-extra-tools +# safeguard: don't use distributed pregenerated files instead of generated ones +find _build-max/ -type f -printf '%%P\n' | grep -v '^mysql-test' | sort >_t1 +find . -type f -printf '%%P\n' | sort >_t2 +join _t[12] | { + err=0 + while read f; do + if ! cmp "$f" _build-max/"$f"; then + err=1; + fi + done + if test "$err" = "1"; then + echo "%buildsubdir/ seems to contain pregenerated distributed files" + echo "that are different from generated files in %buildsubdir/_build-max/." + echo "Better remove the distributed files in %%prep to avoid using these during build." + fi + exit $err +} || exit +rm _t[12] # build mysqld-debug (speed up normal build by skipping tests/ and client/) BuildMySQL "-debug" --with-server-suffix=-debug \ --${BERKELEY}-berkeley-db \ @@ -559,8 +580,10 @@ %dir %attr(755, mysql, mysql) /usr/share/mysql-test/var %files tools -f mysql-tools.files - %changelog +* Thu Nov 08 2007 - mmarek@suse.cz +- avoid using distributed pregenerated files instead of + files generated in the builddirs * Fri Aug 31 2007 - mmarek@suse.cz - make sure mysql-shared is replaced by libmysqlclient15 when updating from 10.1 or 10.2 [#306556] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org