rpms
/
mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use downstream tmpfiles instead of the upstream one; #1538066

This commit is contained in:
Michal Schorm 2018-01-25 12:09:50 +01:00
parent d582a409d7
commit 0f8f4c807c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mariadb.spec
View File

@ -926,6 +926,9 @@ rm scripts/my.cnf
# use different config file name for each variant of server (mariadb / mysql)
mv %{buildroot}%{_sysconfdir}/my.cnf.d/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf
# Rename sysusers and tmpfiles config files, they should be named after the software they belong to
mv %{buildroot}/usr/lib/sysusers.d/sysusers.conf %{buildroot}/usr/lib/sysusers.d/mariadb.conf
# remove SysV init script and a symlink to that, we pack our very own
rm %{buildroot}%{_sysconfdir}/init.d/mysql
rm %{buildroot}%{_libexecdir}/rcmysql
@ -933,6 +936,9 @@ rm %{buildroot}%{_libexecdir}/rcmysql
%if %{with init_systemd}
install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
install -D -p -m 644 scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service
# Remove the upstream version
rm %{buildroot}/usr/lib/tmpfiles.d/tmpfiles.conf
# Install downstream version
install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
%if 0%{?mysqld_pid_dir:1}
echo "d %{pidfiledir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
@ -988,10 +994,6 @@ rm %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
# Shipped as a standalona package in Fedora
rm %{buildroot}%{_bindir}/mytop
# Rename sysusers and tmpfiles config files, they should be named after the software they belong to
mv %{buildroot}/usr/lib/sysusers.d/sysusers.conf %{buildroot}/usr/lib/sysusers.d/mariadb.conf
mv %{buildroot}/usr/lib/tmpfiles.d/tmpfiles.conf %{buildroot}/usr/lib/tmpfiles.d/mariadb.conf
# put logrotate script where it needs to be
mkdir -p %{buildroot}%{logrotateddir}
mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name}
@ -1626,6 +1628,8 @@ fi
- Fix the upgrade path. Build TokuDB subpackage again, but build a unsupported
configuration by upstream (without Jemalloc).
Jemmalloc has been updated to version 5, which isn't backwards compatible.
- Use downstream tmpfiles instead of the upstream one
Related: #1538066
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 3:10.2.12-3
- Rebuilt for switch to libxcrypt