Fix x86_64 build: wrong macro 08/27508/2 accepted/tizen_3.0.2014.q3_common accepted/tizen_3.0.m14.3_ivi accepted/tizen_3.0.m2_mobile accepted/tizen_3.0.m2_tv accepted/tizen_3.0.m2_wearable accepted/tizen_3.0_common accepted/tizen_3.0_ivi accepted/tizen_3.0_mobile accepted/tizen_3.0_tv accepted/tizen_3.0_wearable accepted/tizen_4.0_unified accepted/tizen_5.0_unified accepted/tizen_5.5_unified accepted/tizen_5.5_unified_mobile_hotfix accepted/tizen_5.5_unified_wearable_hotfix accepted/tizen_6.0_unified accepted/tizen_6.0_unified_hotfix accepted/tizen_6.5_unified accepted/tizen_7.0_unified accepted/tizen_7.0_unified_hotfix accepted/tizen_8.0_unified accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_unified accepted/tizen_wearable tizen tizen_3.0 tizen_3.0.2014.q3_common tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common tizen_3.0.m14.3_ivi tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_3.0.m2 tizen_3.0_ivi tizen_3.0_tv tizen_4.0 tizen_5.0 tizen_5.5 tizen_5.5_mobile_hotfix tizen_5.5_tv tizen_5.5_wearable_hotfix tizen_6.0 tizen_6.0_hotfix tizen_6.5 tizen_7.0 tizen_7.0_hotfix tizen_8.0 accepted/tizen/3.0.m2/mobile/20170105.025610 accepted/tizen/3.0.m2/tv/20170105.025710 accepted/tizen/3.0.m2/wearable/20170105.025756 accepted/tizen/3.0/common/20161114.111928 accepted/tizen/3.0/ivi/20161011.065147 accepted/tizen/3.0/mobile/20161015.034419 accepted/tizen/3.0/tv/20161016.010032 accepted/tizen/3.0/wearable/20161015.084444 accepted/tizen/4.0/unified/20170816.010859 accepted/tizen/4.0/unified/20170828.221746 accepted/tizen/5.0/unified/20181102.030033 accepted/tizen/5.5/unified/20191031.013701 accepted/tizen/5.5/unified/mobile/hotfix/20201027.072544 accepted/tizen/5.5/unified/wearable/hotfix/20201027.105118 accepted/tizen/6.0/unified/20201030.104007 accepted/tizen/6.0/unified/hotfix/20201103.045841 accepted/tizen/6.5/unified/20211029.015226 accepted/tizen/7.0/unified/20221110.060440 accepted/tizen/7.0/unified/hotfix/20221116.111515 accepted/tizen/8.0/unified/20231005.095625 accepted/tizen/common/20140915.091301 accepted/tizen/ivi/20160218.025828 accepted/tizen/unified/20170309.040732 submit/tizen_3.0.m2/20170104.093755 submit/tizen_3.0_common/20161104.104000 submit/tizen_3.0_ivi/20161010.000007 submit/tizen_3.0_mobile/20161015.000007 submit/tizen_3.0_tv/20161015.000006 submit/tizen_3.0_wearable/20161015.000006 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170828.100007 submit/tizen_5.0/20181101.000008 submit/tizen_5.5/20191031.000008 submit/tizen_5.5_mobile_hotfix/20201026.185108 submit/tizen_5.5_wearable_hotfix/20201026.184308 submit/tizen_6.0/20201029.205504 submit/tizen_6.0_hotfix/20201102.192904 submit/tizen_6.0_hotfix/20201103.115104 submit/tizen_6.5/20211028.163901 submit/tizen_common/20140915.082914 submit/tizen_ivi/20140916.000000 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000007 submit/tizen_mobile/20141120.000000 submit/tizen_unified/20170308.100417 tizen_3.0.2014.q3_common_release tizen_3.0.m14.3_ivi_release tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release tizen_3.0_ivi_release tizen_4.0.IoT.p1_release tizen_4.0.IoT.p2_release tizen_4.0.m1_release tizen_4.0.m2_release tizen_5.5.m2_release tizen_6.0.m2_release tizen_6.5.m2_release tizen_7.0_m2_release tizen_8.0_m2_release
authorKévin THIERRY <kevin.thierry@open.eurogiciel.org>
Mon, 15 Sep 2014 08:12:13 +0000 (10:12 +0200)
committerKévin THIERRY <kevin.thierry@open.eurogiciel.org>
Mon, 15 Sep 2014 08:17:21 +0000 (01:17 -0700)
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 <kevin.thierry@open.eurogiciel.org>
packaging/update-desktop-files.spec

index d1f160e..b9ffe97 100644 (file)
@@ -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