mirror of
https://abf.rosa.ru/djam/mariadb.git
synced 2025-02-23 14:42:48 +00:00
10.5.27
This commit is contained in:
parent
d8bc3c0050
commit
0f951e109e
2 changed files with 9 additions and 7 deletions
|
@ -22,3 +22,5 @@ addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/suite/plug
|
|||
|
||||
|
||||
addFilter(r'zero-length .* /usr/share/mysql-test')
|
||||
addFilter("E: hardcoded-library-path")
|
||||
|
||||
|
|
14
mariadb.spec
14
mariadb.spec
|
@ -316,7 +316,7 @@ PAM module.
|
|||
# Remove JAR files from the tarball (used for testing from the source)
|
||||
find . -name "*.jar" -type f -exec rm --verbose -f {} \;
|
||||
|
||||
cp %{_sourcedir}/suse-test-run .
|
||||
install -Dm0755 %{S:5} .
|
||||
|
||||
# Remove unneeded manpages ('make install' basically installs everything under
|
||||
# man/*)
|
||||
|
@ -604,7 +604,7 @@ mv %{_builddir}/errormessages.files mariadb-errormessages.files
|
|||
|
||||
# Files not installed by make install
|
||||
# Some of the documentation we need to have installed
|
||||
DOCS=(COPYING README.md EXCEPTIONS-CLIENT %{_sourcedir}/README.debug plugin/daemon_example/daemon_example.ini)
|
||||
DOCS=(COPYING README.md EXCEPTIONS-CLIENT README.debug plugin/daemon_example/daemon_example.ini)
|
||||
DOCDIR=%{buildroot}%{_defaultdocdir}/%{name}
|
||||
install -d -m 755 ${DOCDIR}
|
||||
for i in "${DOCS[@]}"; do
|
||||
|
@ -615,14 +615,14 @@ done
|
|||
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/my.cnf
|
||||
|
||||
# Systemd/initscript
|
||||
install -D -m 755 %{_sourcedir}/mysql-systemd-helper '%{buildroot}'%{_libexecdir}/mysql/mysql-systemd-helper
|
||||
install -Dm0755 %{S:17} '%{buildroot}'%{_libexecdir}/mysql/mysql-systemd-helper
|
||||
sed -i 's|@MYSQLVER@|%{version}|' '%{buildroot}'%{_libexecdir}/mysql/mysql-systemd-helper
|
||||
ln -sf service '%{buildroot}'%{_sbindir}/rcmysql
|
||||
ln -sf service '%{buildroot}'%{_sbindir}/rcmariadb
|
||||
rm -rf '%{buildroot}'%{_sysconfdir}/init.d
|
||||
sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{_sourcedir}/mariadb.service.in > '%{buildroot}'%{_unitdir}/mariadb.service
|
||||
sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{_sourcedir}/mariadb@.service.in > '%{buildroot}'%{_unitdir}/mariadb@.service
|
||||
install -D -m 644 %{_sourcedir}/mariadb.target '%{buildroot}'%{_unitdir}/mariadb.target
|
||||
sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{S:15} > '%{buildroot}'%{_unitdir}/mariadb.service
|
||||
sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{S:18} > '%{buildroot}'%{_unitdir}/mariadb@.service
|
||||
install -Dm0644 %{S:16} '%{buildroot}'%{_unitdir}/mariadb.target
|
||||
# Aliases for the backward compatibility. Create symlinks from the alias to the existing one
|
||||
# We can't use 'Alias=' option only because it's effective only when the unit is enabled
|
||||
ln -sf %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysql.service
|
||||
|
@ -765,7 +765,7 @@ if [ \! -f "%{_localstatedir}/lib/misc/mariadb_upgrade_info" ]; then
|
|||
if [ $1 -eq 1 ]; then
|
||||
cat >> %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something << EOF
|
||||
|
||||
%(cat %{_sourcedir}/README.install)
|
||||
%(cat %{S:7})
|
||||
|
||||
EOF
|
||||
fi
|
||||
|
|
Loading…
Add table
Reference in a new issue