From 1c00b0342f6ad3a09edc7778c061a5218055ad25 Mon Sep 17 00:00:00 2001 From: Roman Tsisyk <roman@tsisyk.com> Date: Mon, 1 Feb 2016 23:01:03 +0300 Subject: [PATCH] RPM: rely on %cmake for all dirs except /etc and /var https://bugzilla.redhat.com/show_bug.cgi?id=1301720 A prerequisite for proper #1085 fix --- rpm/tarantool.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index 984f9adbd9..8b403fb649 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -89,17 +89,9 @@ This package provides common files, admin tools and init scripts. %setup -q -n %{name}-%{version} %build -# GNUInstallDirs doesn't work properly with %%cmake macro. +# RHBZ #1301720: SYSCONFDIR an LOCALSTATEDIR must be specified explicitly %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_BINDIR:PATH=%{_bindir} \ - -DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ - -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \ -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \ - -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=%{_sharedstatedir} \ - -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \ - -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \ - -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ -DENABLE_BUNDLED_LIBYAML:BOOL=OFF \ -DENABLE_BACKTRACE:BOOL=ON \ -- GitLab