Hello community,
here is the log from the commit of package mariadb for openSUSE:Factory checked
in at 2013-08-21 15:08:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mariadb (Old)
and /work/SRC/openSUSE:Factory/.mariadb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mariadb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2013-08-13
10:15:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2013-08-21
15:08:32.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Aug 21 14:52:43 CEST 2013 - mhruse...@suse.cz
+
+- fix includedir in configuration file
+
+-------------------------------------------------------------------
+Sat Aug 17 13:46:26 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Fix INSTALL_LIBDIR_RPM and INSTALL_PLUGINDIR_RPM, they need to
+ point to %_lib, not %_libdir
+- Drop so symlink generation and removal, that is not necessary and
+ breaks non x86_64 builds of dependent packages
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mariadb.spec ++++++
--- /var/tmp/diff_new_pack.KUNDQN/_old 2013-08-21 15:08:33.000000000 +0200
+++ /var/tmp/diff_new_pack.KUNDQN/_new 2013-08-21 15:08:33.000000000 +0200
@@ -447,7 +447,7 @@
%posttrans
if [ -d /var/lib/mysql ]; then
touch /var/lib/mysql/.run-mysql_upgrade
- chown -R mysql:mysql /var/lib/mysql
+ chown -R --no-dereference mysql:mysql /var/lib/mysql
fi
for i in /var/lib/mysql/{.protected,.tmp}; do
( [ -d "$i" ] && rmdir "$i" ) || :
++++++ build.inc ++++++
--- /var/tmp/diff_new_pack.KUNDQN/_old 2013-08-21 15:08:33.000000000 +0200
+++ /var/tmp/diff_new_pack.KUNDQN/_new 2013-08-21 15:08:33.000000000 +0200
@@ -114,8 +114,8 @@
-DWITH_EMBEDDED_SERVER=true
\
-DCOMPILATION_COMMENT="openSUSE package"
\
-DDENABLE_DOWNLOADS=false
\
- -DINSTALL_PLUGINDIR_RPM="%{_libdir}/mysql/plugin"
\
- -DINSTALL_LIBDIR_RPM="%{_libdir}"
\
+ -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin"
\
+ -DINSTALL_LIBDIR_RPM="%{_lib}"
\
"$@" ..
make %{?jobs:-j%jobs}
nm --numeric-sort sql/mysqld > sql/mysqld.sym
++++++ configuration-tweaks.tar.bz2 ++++++
++++++ install.inc ++++++
--- /var/tmp/diff_new_pack.KUNDQN/_old 2013-08-21 15:08:33.000000000 +0200
+++ /var/tmp/diff_new_pack.KUNDQN/_new 2013-08-21 15:08:33.000000000 +0200
@@ -1,5 +1,4 @@
# install the debug server first, so that we don't overwrite the standard
-# /usr/sbin/mysqld
mkdir -p %buildroot%_libdir/mysql
make -C _build-debug/sql install DESTDIR=%buildroot
mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
@@ -10,16 +9,13 @@
# 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
+[ \! -f "%{buildroot}%{_bindir}/mytop" ] || mv %{buildroot}%{_bindir}/mytop
%{buildroot}%{_bindir}/%{name}_mytop
rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so
# remove most static libs (FIXME: don't build them at all...)
[ \! -f "%buildroot%_libdir/"libmysqld.a ] || mv
"%buildroot%_libdir/"libmysqld.a "%buildroot%_libdir/"libmysqld.static
rm -f %buildroot%_libdir/*.a
[ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv
"%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a
rm -f %buildroot%_libdir/mysql/{,plugin}/*.{a,la}
-# XXX: package these? The ndb tools are linked statically atm
rm -f %buildroot%_libdir/mysql/libndbclient.*
rm -f %{buildroot}/usr/share/mysql-test/{mysql-test-run,mtr}
rm -f
%{buildroot}/usr/share/mysql/{binary-configure,errmsg-utf8.txt,magic,mysql-log-rotate,mysql*.server}
@@ -27,8 +23,7 @@
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run
mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process
%{buildroot}%{_bindir}
-# generate filelist for binaries and their manpages (easier than enumerating
-# all the binaries and manapages manually
+# generate filelist for binaries and their manpages
filelist()
{
echo '%%defattr(-, root, root)'
@@ -125,23 +120,6 @@
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'
++++++ my.ini ++++++
--- /var/tmp/diff_new_pack.KUNDQN/_old 2013-08-21 15:08:33.000000000 +0200
+++ /var/tmp/diff_new_pack.KUNDQN/_new 2013-08-21 15:08:33.000000000 +0200
@@ -98,6 +98,6 @@
# socket = /var/lib/mysql-databases/mysqld6/mysql.sock
# user = mysql
-!include_dir /etc/mysql
-!include_dir /etc/my.cnf.d
+!includedir /etc/mysql
+!includedir /etc/my.cnf.d
++++++ mysql-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mysql-patches/mysql-patches/mariadb-5.2.3-cnf.patch
new/mysql-patches/mysql-patches/mariadb-5.2.3-cnf.patch
--- old/mysql-patches/mysql-patches/mariadb-5.2.3-cnf.patch 2013-07-25
09:34:00.000000000 +0200
+++ new/mysql-patches/mysql-patches/mariadb-5.2.3-cnf.patch 2013-08-14
09:05:39.000000000 +0200
@@ -18,7 +18,7 @@
+log-error=/var/log/mysql/mysqld.log
+socket = @MYSQL_UNIX_ADDR@
+
-+!include_dir /etc/mysql
++!includedir /etc/mysql
+
[mysqldump]
+socket = @MYSQL_UNIX_ADDR@
@@ -38,7 +38,7 @@
+log-error=/var/log/mysql/mysqld.log
+socket = @MYSQL_UNIX_ADDR@
+
-+!include_dir /etc/mysql
++!includedir /etc/mysql
+
[mysqldump]
+socket = @MYSQL_UNIX_ADDR@
@@ -67,7 +67,7 @@
+log-error = /var/log/mysql/mysqld.log
+socket = @MYSQL_UNIX_ADDR@
+
-+!include_dir /etc/mysql
++!includedir /etc/mysql
+
[mysqldump]
+socket = @MYSQL_UNIX_ADDR@
@@ -87,7 +87,7 @@
+log-error = /var/log/mysql/mysqld.log
+socket = @MYSQL_UNIX_ADDR@
+
-+!include_dir /etc/mysql
++!includedir /etc/mysql
+
[mysqldump]
+socket = @MYSQL_UNIX_ADDR@
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
