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

Move bdb specific systemd-tmpfiles cleanup crutch behind the bdb bcond

Browse Source
This commit is contained in:
Panu Matilainen 2020-04-01 14:10:37 +03:00
parent a5c4573419
commit 52a9ca7aad
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpm.spec
View File

@ -25,17 +25,17 @@
%global rpmver 4.15.90 %global rpmver 4.15.90
%global snapver git14971 %global snapver git14971
%global rel 1 %global rel 2
%global srcver %{version}%{?snapver:-%{snapver}} %global srcver %{version}%{?snapver:-%{snapver}}
%global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
%if %{with bdb} %if %{with bdb}
%define bdbver 5.3.15 %define bdbver 5.3.15
%endif
# Build-dependency on systemd for the sake of one macro would be a bit much... # Build-dependency on systemd for the sake of one macro would be a bit much...
%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
%endif
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
@ -359,8 +359,10 @@ install -m 755 scripts/rpm.daily ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/rpm
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/rpm install -m 644 scripts/rpm.log ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/rpm
%if %{with bdb}
mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir} mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir}
echo "r /var/lib/rpm/__db.*" > ${RPM_BUILD_ROOT}%{_tmpfilesdir}/rpm.conf echo "r /var/lib/rpm/__db.*" > ${RPM_BUILD_ROOT}%{_tmpfilesdir}/rpm.conf
%endif
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm
mkdir -p $RPM_BUILD_ROOT%{rpmhome}/macros.d mkdir -p $RPM_BUILD_ROOT%{rpmhome}/macros.d
@ -389,7 +391,10 @@ make check || (cat tests/rpmtests.log; exit 1)
%license COPYING %license COPYING
%doc CREDITS doc/manual/[a-z]* %doc CREDITS doc/manual/[a-z]*
%if %{with bdb}
%{_tmpfilesdir}/rpm.conf %{_tmpfilesdir}/rpm.conf
%endif
%dir %{_sysconfdir}/rpm %dir %{_sysconfdir}/rpm
%attr(0755, root, root) %dir /var/lib/rpm %attr(0755, root, root) %dir /var/lib/rpm
@ -518,6 +523,9 @@ make check || (cat tests/rpmtests.log; exit 1)
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Tue Mar 31 2020 Panu Matilainen <pmatilai@redhat.com> - 4.15.90-0.git14971.2
- Move bdb specific systemd-tmpfiles cleanup crutch behind the bdb bcond
* Tue Mar 31 2020 Panu Matilainen <pmatilai@redhat.com> - 4.15.90-0.git14971.1 * Tue Mar 31 2020 Panu Matilainen <pmatilai@redhat.com> - 4.15.90-0.git14971.1
- Rebase to rpm 4.16 alpha (https://rpm.org/wiki/Releases/4.16.0) - Rebase to rpm 4.16 alpha (https://rpm.org/wiki/Releases/4.16.0)
- Add bconds for and enable sqlite, ndb and bdb_ro database backends - Add bconds for and enable sqlite, ndb and bdb_ro database backends