commit c89f53e53100f70db3074e25a0124ac02b5e66ff
Author: Björn Esser <bjoern.esser(a)gmail.com>
Date: Thu Mar 13 13:43:53 2014 +0100
place rpm-macros into proper location
shogun-data.spec | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/shogun-data.spec b/shogun-data.spec
index d1e4f84..b56505f 100644
--- a/shogun-data.spec
+++ b/shogun-data.spec
@@ -1,6 +1,9 @@
# Conditional for release and snapshot builds. Uncomment for release-builds.
#%%global rel_build 1
+# Place rpm-macros into proper location.
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo
$d)
+
# Settings used for build from snapshots.
%{!?rel_build:%global commit 6615cf007634595d459853bf4dc6f1a227d2450c}
%{!?rel_build:%global commit_date 20140303}
@@ -16,7 +19,7 @@
Name: %{mainprg}-data
Version: 0.8.1
-Release: 0.3%{?gitrel}%{?dist}
+Release: 0.4%{?gitrel}%{?dist}
Summary: Data-files for the SHOGUN machine learning toolbox
%{?el5:Group: Documentation}
@@ -53,8 +56,8 @@ mkdir -p %{buildroot}/%{_datadir}/%{mainprg}/data
cp -a */ %{buildroot}/%{_datadir}/%{mainprg}/data
# Create a macro for use in other spec-files.
-mkdir -p %{buildroot}/%{_sysconfdir}/rpm
-cat << EOF > %{buildroot}/%{_sysconfdir}/rpm/macros.%{name}
+mkdir -p %{buildroot}/%{macrosdir}
+cat << EOF > %{buildroot}/%{macrosdir}/macros.%{name}
%_%{mainprg}_data_dir %{_datadir}/%{mainprg}/data
%_%{mainprg}_data_version %{version}-%{release}
EOF
@@ -65,12 +68,15 @@ EOF
%files
-%config %{_sysconfdir}/rpm/macros.%{name}
+%config %{buildroot}/%{macrosdir}/macros.%{name}
%doc LICENSE README.*
%{_datadir}/%{mainprg}
%changelog
+* Thu Mar 13 2014 Björn Esser <bjoern.esser(a)gmail.com> -
0.8.1-0.4.git20140303.6615cf0
+- place rpm-macros into proper location
+
* Fri Mar 07 2014 Björn Esser <bjoern.esser(a)gmail.com> -
0.8.1-0.3.git20140303.6615cf0
- the %%{?dist}-tag must preserved in exported macros
Show replies by date