[sugar-toolkit-gtk3] Install macros non-execubtable to %{_rpmconfigdir}/macros.d.

Ville Skyttä scop at fedoraproject.org
Tue Feb 18 16:18:28 UTC 2014


commit 5fb3492297d2590de5e340de3062a461bc7e9e86
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Feb 18 18:04:31 2014 +0200

    Install macros non-execubtable to %{_rpmconfigdir}/macros.d.
    
    https://lists.fedoraproject.org/pipermail/devel/2014-January/195026.html

 sugar-toolkit-gtk3.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/sugar-toolkit-gtk3.spec b/sugar-toolkit-gtk3.spec
index 2756d59..05ff001 100644
--- a/sugar-toolkit-gtk3.spec
+++ b/sugar-toolkit-gtk3.spec
@@ -3,7 +3,7 @@
 Summary: Sugar toolkit GTK+ 3
 Name:    sugar-toolkit-gtk3
 Version: 0.101.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL:     http://wiki.laptop.org/go/Sugar
 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.xz
 Source1: macros.sugar
@@ -56,8 +56,8 @@ make %{?_smp_mflags} V=1
 %install
 make install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}/%{_sysconfdir}/rpm/
-install -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/rpm/macros.sugar
+mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/
+install -pm 644 %{SOURCE1} %{buildroot}/%{_rpmconfigdir}/macros.d/macros.sugar
 
 %find_lang %name
 
@@ -73,7 +73,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %doc COPYING README
 %{python_sitelib}/*
 %{_bindir}/sugar-activity-web
-%{_sysconfdir}/rpm/macros.sugar
+%{_rpmconfigdir}/macros.d/macros.sugar
 %{_libdir}/girepository-1.0/*.typelib
 %{_libdir}/lib*.so.*
 %{_bindir}/sugar-activity
@@ -84,6 +84,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gir-1.0/*.gir
 
 %changelog
+* Tue Feb 18 2014 Ville Skyttä <ville.skytta at iki.fi> - 0.101.2-2
+- Install macros non-executable to %%{_rpmconfigdir}/macros.d.
+
 * Sat Feb 15 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.101.2-1
 - 0.101.2 devel release
 


More information about the scm-commits mailing list