[sugar-toolkit] Fix rpm macro location (#1074286)
Peter Robinson
pbrobinson at fedoraproject.org
Fri Jun 13 12:35:07 UTC 2014
commit 661c11fa92af45dc59eeffc041d162fad15c0256
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Fri Jun 13 13:34:58 2014 +0100
Fix rpm macro location (#1074286)
sugar-toolkit.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/sugar-toolkit.spec b/sugar-toolkit.spec
index 7f3fdf7..caa363f 100644
--- a/sugar-toolkit.spec
+++ b/sugar-toolkit.spec
@@ -3,7 +3,7 @@
Summary: Sugar toolkit
Name: sugar-toolkit
Version: 0.98.1
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://wiki.laptop.org/go/Sugar
Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
Source1: macros.sugar
@@ -47,8 +47,8 @@ make %{?_smp_mflags} V=1
%install
make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/%{_rpmconfigdir}
-install -p %{SOURCE1} %{buildroot}/%{_rpmconfigdir}/macros.sugar
+mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d
+install -p %{SOURCE1} %{buildroot}/%{_rpmconfigdir}/macros.d/macros.sugar
%find_lang %name
@@ -58,9 +58,12 @@ find %{buildroot} -type f -name "*.la" -delete
%files -f %{name}.lang
%doc COPYING README
%{python_sitelib}/*
-%{_rpmconfigdir}/macros.sugar
+%{_rpmconfigdir}/macros.d/macros.sugar
%changelog
+* Thu Jun 12 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.98.1-5
+- Fix rpm macro location (#1074286)
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.98.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list