Hello community,
here is the log from the commit of package mysql-community-server for
openSUSE:Factory checked in at 2013-08-01 17:14:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old)
and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-community-server"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes
2013-06-26 20:25:07.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes
2013-08-01 17:14:16.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Jul 31 15:31:40 CEST 2013 - [email protected]
+
+- get rid of info which is not info (bnc#747811)
+- minor polishing of spec/installation
+
+-------------------------------------------------------------------
+Fri Jul 26 10:06:18 CEST 2013 - [email protected]
+
+- fix ownership of logdir (bnc#763150)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-community-server.spec ++++++
--- /var/tmp/diff_new_pack.BZQjsA/_old 2013-08-01 17:14:17.000000000 +0200
+++ /var/tmp/diff_new_pack.BZQjsA/_new 2013-08-01 17:14:17.000000000 +0200
@@ -55,10 +55,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
PreReq: pwdutils
-PreReq: %install_info_prereq %insserv_prereq
%endif
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: bison
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libaio-devel
@@ -68,7 +68,6 @@
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: procps
-BuildRequires: readline-devel
BuildRequires: zlib-devel
%if 0%{?suse_version}
BuildRequires: pwdutils
@@ -400,7 +399,7 @@
/usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || :
/usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
-s /bin/false -d /var/lib/mysql mysql 2> /dev/null || :
-/usr/sbin/usermod -g mysql -s /bin/false mysql || :
+/usr/sbin/usermod -g mysql -s /bin/false mysql 2> /dev/null || :
# systemd requirment
%if 0%{?suse_version} >= 1210
%service_add_pre mysql.service
@@ -410,7 +409,7 @@
/usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || :
/usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
-s /bin/false -d /var/lib/mysql mysql 2> /dev/null || :
-/usr/sbin/usermod -g mysql -s /bin/false mysql || :
+/usr/sbin/usermod -g mysql -s /bin/false mysql 2> /dev/null || :
%post
# systemd requirment
@@ -433,17 +432,8 @@
os.execute("/bin/mkdir -p /var/run/mysql/restart")
end
end
-dbfile="var/mysql/mysql/db.ISM"
-olddir="var/mysql"
-newdir="var/lib/mysql"
--- Do the database files still belong to root (very old installation)?
--- Change ownerships
-if posix.stat(dbfile, "uid") == 0 then
- os.execute("/bin/chown -Rv mysql:mysql var/mysql/")
-end
%posttrans
-%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.*
if [ -d /var/lib/mysql ]; then
touch /var/lib/mysql/.run-mysql_upgrade
chown -R mysql:mysql /var/lib/mysql
@@ -483,7 +473,6 @@
%postun
if [ $1 = 0 ]; then
- %install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.*
%{insserv_cleanup}
rm -f "/var/lib/systemd/migrated/mysql.service"
if [ -x /usr/bin/systemctl ]; then
@@ -502,7 +491,6 @@
%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf.d/*
%config /etc/logrotate.d/mysql
%doc %{_defaultdocdir}/%{name}
-%doc %{_infodir}/mysql.info.*
/etc/init.d/mysql
/usr/sbin/rcmysql
%dir /usr/share/%{name}
++++++ configuration-tweaks.tar.bz2 ++++++
++++++ install.inc ++++++
--- /var/tmp/diff_new_pack.BZQjsA/_old 2013-08-01 17:14:17.000000000 +0200
+++ /var/tmp/diff_new_pack.BZQjsA/_new 2013-08-01 17:14:17.000000000 +0200
@@ -10,6 +10,9 @@
# remove handler socket client
rm -f %buildroot%_libdir/libhsclient*
rm -f %buildroot%_bindir/hsclient*
+if [ -f "%{buildroot}%{_bindir}/mytop" ]; then
+ mv %{buildroot}%{_bindir}/mytop %{buildroot}%{_bindir}/%{name}_mytop
+fi
rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so
# remove most static libs (FIXME: don't build them at all...)
rm -f %buildroot%_libdir/libmysqlclient*a
@@ -56,7 +59,7 @@
filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest
mysqltest_embedded >mysql-test.files
# all binaries that don't need to be in a "default" install (mysql.rpm +
# mysql-client.rpm)
-filelist msql2mysql mysql_config_editor mysql_plugin
mysql_convert_table_format mysql_find_rows mysql_setpermission
mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace
mysql_embedded mytop hsclient >mysql-tools.files
+filelist msql2mysql mysql_config_editor mysql_plugin
mysql_convert_table_format mysql_find_rows mysql_setpermission
mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace
mysql_embedded %{name}_mytop hsclient >mysql-tools.files
filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files
filelist ndb_mgmd >mysql-ndb-management.files
filelist
ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter}
>mysql-ndb-tools.files
@@ -105,9 +108,6 @@
# testsuite
mkdir -p '%buildroot'/usr/share/mysql-test/
install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/
-# XXX this should go under /var/..., but some tests get confused by a symlink
-# var -> ../../../var/...
-#ln -sf ../../../var/lib/mysql/mysql-test %buildroot/usr/share/mysql-test/var
mkdir '%buildroot'/usr/share/mysql-test/var
# Final fixes
find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete
@@ -131,18 +131,33 @@
rm -f .$tmp
done
%endif
+pushd '%buildroot'/%_libdir
+for i in *.so.*.*.*; do
+ if [ -L "$i" ]; then
+ trg="`readlink "$i"`"
+ rm "$i"
+ mv "$trg" "$i"
+ ln -s "$i" "$trg"
+ fi
+done
+for i in *.so.*; do
+ if [ -L "$i" ] && [ -L "`readlink "$i"`" ]; then
+ trg="`readlink "$i"`"
+ rm "$i"
+ ln -s "`readlink "$trg"`" "$i"
+ fi
+done
+popd
%if ! 0%{prefered} > 0
cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do
cd '%buildroot'
rm -f ."$tmp"
done
rm -rf '%buildroot'/%_libdir/libmysqld.*
-rm -rf '%buildroot'/%_libdir/*.la
-rm -rf '%buildroot'/%_libdir/*.so
+rm -rf '%buildroot'/%_libdir/{*.la,*.so,*.a}
rm -rf '%buildroot'/%_datadir/man/*/mysql_config.1*
rm -rf '%buildroot'/%_includedir
rm -rf '%buildroot'/%_datadir/aclocal
-rm -rf '%buildroot'/%_libdir/*.a
%endif
sed -i 's|doc/packages/mysql|doc/packages/%{name}|g'
'%buildroot'/etc/init.d/mysql
ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair
@@ -158,15 +173,11 @@
mkdir -p '%buildroot'/etc/my.cnf.d
rm -rf '%buildroot'/etc/my.cnf.d/*
bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C
'%buildroot'/etc/my.cnf.d -xvf -
-if [ -z "`ls '%buildroot'/usr/share/info/mysql.info*`" ]; then
- install -D -m 0644 Docs/mysql.info
"%buildroot/usr/share/info/mysql.info"
- gzip -9 "%buildroot/usr/share/info/mysql.info"
-fi
+[ -z "`ls '%buildroot'/usr/share/info/mysql.info* 2> /dev/null`" ] || rm -f
'%buildroot'/usr/share/info/mysql.info*
if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so`" ]; then
echo '%%dir %%_libdir/mysql' >> mysql-client.files
echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files
echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files
fi
rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}*
-rm -rf '%buildroot'/usr/share/mysql/solaris
-rm -rf '%buildroot'/usr/share/mysql/SELinux
+rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux}
++++++ my.ini ++++++
--- /var/tmp/diff_new_pack.BZQjsA/_old 2013-08-01 17:14:17.000000000 +0200
+++ /var/tmp/diff_new_pack.BZQjsA/_new 2013-08-01 17:14:17.000000000 +0200
@@ -10,6 +10,9 @@
[mysqld]
+# Remove leading # if you don't want to listen on network (only socket - safer)
+# skip-networking
+
# Remove leading # and set to the amount of RAM for the most important data
# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
# innodb_buffer_pool_size = 128M
++++++ mysql-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch
new/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch
--- old/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch
2013-03-25 23:14:09.000000000 +0100
+++ new/mysql-patches/mysql-patches/mysql-community-server-5.1.31-shebang.patch
2013-07-25 09:34:00.000000000 +0200
@@ -1,4 +1,5 @@
PATCH-P1-FIX-UPSTREAM: Adds shebangs
+BUGS: mysql#69820
Shebangs were missing at various places, so we are adding them.
++++++ rc.mysql-multi ++++++
--- /var/tmp/diff_new_pack.BZQjsA/_old 2013-08-01 17:14:17.000000000 +0200
+++ /var/tmp/diff_new_pack.BZQjsA/_new 2013-08-01 17:14:17.000000000 +0200
@@ -329,8 +329,9 @@
log_dir="`dirname "$i"`"
if [ \! -d "$log_dir" ]; then
mkdir -p "$log_dir"
- chmod 770 "$log_dir"
fi
+ chmod 770 "$log_dir"
+ chown -R mysql:mysql "$log_dir"
done
# We assume a fresh install if the directory $datadir/mysql
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
