[blender] Use new rpm macro for rpm macro direcgory (#1074263)
Jochen Schmitt
s4504kr at fedoraproject.org
Sun Mar 9 13:52:20 UTC 2014
commit 9cd99f205ca91a7dd638bd06679937569a511949
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Sun Mar 9 14:52:04 2014 +0100
Use new rpm macro for rpm macro direcgory (#1074263)
blender.spec | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/blender.spec b/blender.spec
index d7fc175..97e2391 100644
--- a/blender.spec
+++ b/blender.spec
@@ -11,10 +11,12 @@
%global fontname blender
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+
Name: blender
Epoch: 1
Version: %{blender_api}
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -243,10 +245,10 @@ rm -rf ${RPM_BUILD_ROOT}/%{blenderlib}/datafiles/fonts
# rpm macros
#
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
+mkdir -p ${RPM_BUILD_ROOT}%{macrosdir}
sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} \
- >${RPM_BUILD_ROOT}%{_sysconfdir}/rpm/macros.blender
+ >${RPM_BUILD_ROOT}%{macrosdir}/macros.blender
rm ${RPM_BUILD_ROOT}/%{_datadir}/locale/languages
@@ -291,7 +293,7 @@ fi || :
%files rpm-macros
%defattr(-,root,root,-)
-%{_sysconfdir}/rpm/macros.blender
+%{macrosdir}/rpm/macros.blender
%files -n fonts-blender
%defattr(-,root,root,-)
@@ -299,6 +301,9 @@ fi || :
%doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
%changelog
+* Sun Mar 9 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.69-7
+- Use new rpm macro for rpm macro direcgory (#1074263)
+
* Mon Jan 13 2014 Richard Shaw <hobbes1069 at gmail.com> - 1:2.69-6
- Rebuild for updated OpenImageIO 1.3.11.
More information about the scm-commits
mailing list