From affe917daa01f2d0aab93a5aa7d76da16a854f53 Mon Sep 17 00:00:00 2001 From: Tomasz Pala Date: Sun, 19 Nov 2017 12:57:51 +0100 Subject: [PATCH 1/1] use libexec directory for private binaries - optional since FHS 3.0 As discussed before, it's time to stop hacking package build systems and start doing some cleanups gradually. http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2017-July/025378.html http://lists.pld-linux.org/mailman/pipermail/pld-devel-pl/2017-June/157370.html --- macros.pld.in | 2 +- rpm.spec | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/macros.pld.in b/macros.pld.in index de2f125..326b00b 100644 --- a/macros.pld.in +++ b/macros.pld.in @@ -25,7 +25,7 @@ %_exec_prefix %{_prefix} %_bindir %{_exec_prefix}/bin %_sbindir %{_exec_prefix}/sbin -%_libexecdir %{_exec_prefix}/%{_lib} +%_libexecdir %{_exec_prefix}/libexec %_datadir %{_prefix}/share %_sysconfdir %{_prefix}/etc %_sharedstatedir /var/lib diff --git a/rpm.spec b/rpm.spec index 92c711d..ac613f1 100644 --- a/rpm.spec +++ b/rpm.spec @@ -47,7 +47,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.15 -Release: 40 +Release: 41 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm @@ -362,6 +362,7 @@ BuildRequires: popt-static >= %{reqpopt_ver} BuildRequires: zlib-static %endif Requires(posttrans): coreutils +Requires: FHS >= 3.0-2 Requires: %{name}-base = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} Requires: beecrypt >= %{beecrypt_ver} -- 2.43.0