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

Accepting request 920278 from home:dspinella:branches:server:database

Browse Source 
- Replace %{_rpmconfigdir}/macros.d with %{_rpmmacrodir},
  remove ownership of this directory. Fixes boo#1182218
- Run spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/920278
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=278
This commit is contained in:
Martin Pluskal 2021-09-21 10:50:32 +00:00 committed by Git OBS Bridge
parent 38e7ee57e7
commit 3bff8867f1
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mariadb.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 20 09:01:17 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Replace %{_rpmconfigdir}/macros.d with %{_rpmmacrodir},
remove ownership of this directory. Fixes boo#1182218
- Run spec-cleaner
-------------------------------------------------------------------
Mon Sep 6 08:35:07 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

11
mariadb.spec
View File

@ -611,8 +611,8 @@ filelist galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariaback
touch mariadb-galera-exclude.files
%else
filelist_excludes galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan >mariadb-galera-exclude.files
echo /usr/share/mysql/systemd/use_galera_new_cluster.conf >>mariadb-galera-exclude.files
echo /usr/share/mysql/wsrep_notify >>mariadb-galera-exclude.files
echo %{_datadir}/mysql/systemd/use_galera_new_cluster.conf >>mariadb-galera-exclude.files
echo %{_datadir}/mysql/wsrep_notify >>mariadb-galera-exclude.files
%endif
# mariadb-bench.files
@ -714,8 +714,8 @@ rm -rf '%{buildroot}'%{_datadir}/mysql/{solaris,SELinux}
mkdir -p '%{buildroot}'%{_localstatedir}/lib/mysql-files
# install rpm macros file
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
install -m 644 %{SOURCE19} %{buildroot}%{_rpmconfigdir}/macros.d
mkdir -p %{buildroot}%{_rpmmacrodir}
install -m 644 %{SOURCE19} %{buildroot}%{_rpmmacrodir}
# Install sysusers.d file
mkdir -p %{buildroot}%{_sysusersdir}
@ -905,8 +905,7 @@ exit 0
%{_datadir}/mysql/systemd/mariadb@.socket
%files rpm-macros
%dir %{_rpmconfigdir}/macros.d
%{_rpmconfigdir}/macros.d/macros.mariadb-test
%{_rpmmacrodir}/macros.mariadb-test
%files -n libmariadbd%{soname}
%{_libdir}/libmariadbd.so.*