From: Kévin THIERRY Date: Mon, 15 Sep 2014 08:12:13 +0000 (+0200) Subject: Fix x86_64 build: wrong macro X-Git-Tag: accepted/tizen/3.0.m2/mobile/20170105.025610^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_3.0.m14.3_ivi;p=platform%2Fupstream%2Fupdate-desktop-files.git Fix x86_64 build: wrong macro Directory "brp-tizen.d" is located in /usr/lib/rpm but was set to %{_libdir}/rpm which expands to /usr/lib64/rpm for 64 bit architectures. Using the macro %{_rpmconfigdir} solves this issue since it allways expands to /usr/lib/rpm. The issue was introduced by commit: ca1b55134e1f144f7d06d69e9edb8197a3cfc9e1 Change-Id: Ida24145c24913f782d1756130525c42ba71645e5 Signed-off-by: Kévin THIERRY --- diff --git a/packaging/update-desktop-files.spec b/packaging/update-desktop-files.spec index d1f160e..b9ffe97 100644 --- a/packaging/update-desktop-files.spec +++ b/packaging/update-desktop-files.spec @@ -39,7 +39,7 @@ cd %name mkdir -p %{buildroot}%{_rpmconfigdir} install -m0755 %SOURCE0 %SOURCE1 %{buildroot}%{_rpmconfigdir} install -m0644 -D %SOURCE2 %{buildroot}%{_sysconfdir}/rpm/macros.%name -install -m0755 -D %SOURCE4 %{buildroot}%{_libdir}/rpm/brp-tizen.d/brp-70-trim-desktopfiles +install -m0755 -D %SOURCE4 %{buildroot}%{_rpmconfigdir}/brp-tizen.d/brp-70-trim-desktopfiles %files %manifest %{name}.manifest