rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

- systemd not depending on SUSE version anymore

Browse Source 
- fixing build on distributions with %docdir != %datadir/doc/%name

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=157
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2014-09-24 09:38:23 +00:00 committed by Git OBS Bridge
parent 2d950ab471
commit 7be5b15fc6
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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:8ec50f340dbc624772923a07c72a66867b26ba2482cb2a9a4fe547e78a1cf89f oid sha256:c81b45d232be16f37661209ae30414b9d365b9633fee3101f02f0965faa0f5e4
size 222 size 222

10
install.inc
View File

@ -86,7 +86,7 @@ install -m 660 %{S:14} %buildroot/etc/my.cnf
for i in "${DOCS[@]}"; do for i in "${DOCS[@]}"; do
install -m 644 "${i}" "${DOCDIR}" || true install -m 644 "${i}" "${DOCDIR}" || true
done done
%if 0%{?suse_version} >= 1210 && 0%{?use_systemd} > 0 %if 0%{?use_systemd} > 0
install -D -m 755 %_sourcedir/rc.mysql.systemd '%buildroot'/usr/lib/mysql/rcmysql install -D -m 755 %_sourcedir/rc.mysql.systemd '%buildroot'/usr/lib/mysql/rcmysql
sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/usr/lib/mysql/rcmysql sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/usr/lib/mysql/rcmysql
ln -sf service '%buildroot'/usr/sbin/rcmysql ln -sf service '%buildroot'/usr/sbin/rcmysql
@ -163,6 +163,14 @@ if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files
echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files
fi fi
if [ %{_defaultdocdir} \!= /usr/share/doc ]; then
rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}* rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}*
fi
if [ %{name} \!= mysql ]; then
rm -rf '%buildroot'/usr/share/doc/mysql
fi
if [ %{name} \!= mariadb ]; then
rm -rf '%buildroot'/usr/share/doc/mariadb
fi
rm -f '%buildroot'/usr/share/doc/* 2> /dev/null || true rm -f '%buildroot'/usr/share/doc/* 2> /dev/null || true
rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux} rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux}

6
mariadb.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 24 08:08:36 UTC 2014 - michal.hrusecky@opensuse.org
- systemd not depending on SUSE version anymore
- fixing build on distributions with %docdir != %datadir/doc/%name
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 19 17:41:26 UTC 2014 - michal.hrusecky@opensuse.org Fri Sep 19 17:41:26 UTC 2014 - michal.hrusecky@opensuse.org

2
mariadb.spec
View File

@ -541,7 +541,7 @@ fi
%if %have_info %if %have_info
%doc %{_infodir}/mysql.info.* %doc %{_infodir}/mysql.info.*
%endif %endif
%if 0%{?suse_version} >= 1210 && 0%{?use_systemd} > 0 %if 0%{?use_systemd} > 0
%dir /usr/lib/mysql %dir /usr/lib/mysql
/usr/lib/mysql/rcmysql /usr/lib/mysql/rcmysql
/usr/lib/systemd/system/mysql.service /usr/lib/systemd/system/mysql.service