pool/mariadb
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix includedir in configuration file

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=132
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2013-08-21 12:53:18 +00:00 committed by Git OBS Bridge
parent 5a7975002d
commit 6acdee27dc
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configuration-tweaks.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:5e1d7b3da204d4812554888639fd49101b3a2d87c41bac802df35cf794ef088c oid sha256:a5824b02d7cfe00333ac4adfec1856311fd27fafea7affc1656c5543a44db4a6
size 312 size 318

9
install.inc
View File

@ -1,5 +1,4 @@
# install the debug server first, so that we don't overwrite the standard # install the debug server first, so that we don't overwrite the standard
# /usr/sbin/mysqld
mkdir -p %buildroot%_libdir/mysql mkdir -p %buildroot%_libdir/mysql
make -C _build-debug/sql install DESTDIR=%buildroot make -C _build-debug/sql install DESTDIR=%buildroot
mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
@ -10,16 +9,13 @@ install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
# remove handler socket client # remove handler socket client
rm -f %buildroot%_libdir/libhsclient* rm -f %buildroot%_libdir/libhsclient*
rm -f %buildroot%_bindir/hsclient* rm -f %buildroot%_bindir/hsclient*
if [ -f "%{buildroot}%{_bindir}/mytop" ]; then [ \! -f "%{buildroot}%{_bindir}/mytop" ] || mv %{buildroot}%{_bindir}/mytop %{buildroot}%{_bindir}/%{name}_mytop
mv %{buildroot}%{_bindir}/mytop %{buildroot}%{_bindir}/%{name}_mytop
fi
rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so rm -f %buildroot%_libdir/mysql/plugin/handlersocket.so
# remove most static libs (FIXME: don't build them at all...) # 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 [ \! -f "%buildroot%_libdir/"libmysqld.a ] || mv "%buildroot%_libdir/"libmysqld.a "%buildroot%_libdir/"libmysqld.static
rm -f %buildroot%_libdir/*.a rm -f %buildroot%_libdir/*.a
[ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv "%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a [ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv "%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a
rm -f %buildroot%_libdir/mysql/{,plugin}/*.{a,la} 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%_libdir/mysql/libndbclient.*
rm -f %{buildroot}/usr/share/mysql-test/{mysql-test-run,mtr} 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} rm -f %{buildroot}/usr/share/mysql/{binary-configure,errmsg-utf8.txt,magic,mysql-log-rotate,mysql*.server}
@ -27,8 +23,7 @@ rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr 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 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} mv %{buildroot}/usr/share/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
# generate filelist for binaries and their manpages (easier than enumerating # generate filelist for binaries and their manpages
# all the binaries and manapages manually
filelist() filelist()
{ {
echo '%%defattr(-, root, root)' echo '%%defattr(-, root, root)'

5
mariadb.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 21 14:52:43 CEST 2013 - mhrusecky@suse.cz
- fix includedir in configuration file
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Aug 17 13:46:26 UTC 2013 - hrvoje.senjan@gmail.com Sat Aug 17 13:46:26 UTC 2013 - hrvoje.senjan@gmail.com

2
mariadb.spec
View File

@ -447,7 +447,7 @@ end
%posttrans %posttrans
if [ -d /var/lib/mysql ]; then if [ -d /var/lib/mysql ]; then
touch /var/lib/mysql/.run-mysql_upgrade touch /var/lib/mysql/.run-mysql_upgrade
chown -R mysql:mysql /var/lib/mysql chown -R --no-dereference mysql:mysql /var/lib/mysql
fi fi
for i in /var/lib/mysql/{.protected,.tmp}; do for i in /var/lib/mysql/{.protected,.tmp}; do
( [ -d "$i" ] && rmdir "$i" ) || : ( [ -d "$i" ] && rmdir "$i" ) || :

4
my.ini
View File

@ -98,6 +98,6 @@ log = /var/log/mysqld_multi.log
# socket = /var/lib/mysql-databases/mysqld6/mysql.sock # socket = /var/lib/mysql-databases/mysqld6/mysql.sock
# user = mysql # user = mysql
!include_dir /etc/mysql !includedir /etc/mysql
!include_dir /etc/my.cnf.d !includedir /etc/my.cnf.d

4
mysql-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:3c9a38335384fb99e0ac76488a2dd72cefa8fbca5f9f2b191c2348ecc64d6b0b oid sha256:166945cf5ab12a72f10c01211781dc3da69d71e6d24e55756220d2865af8654e
size 13306 size 13346