[keyrings-filesystem] Install macros in %%{_rpmconfigdir}/macros.d

Sandro Mani smani at fedoraproject.org
Fri Jan 31 20:41:39 UTC 2014


commit 606afe8a2e2980bffd962a60314ca5ca49d0513a
Author: Sandro Mani <manisandro at gmail.com>
Date:   Fri Jan 31 21:42:01 2014 +0100

    Install macros in %%{_rpmconfigdir}/macros.d

 keyrings-filesystem.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/keyrings-filesystem.spec b/keyrings-filesystem.spec
index 4832318..ee23d87 100644
--- a/keyrings-filesystem.spec
+++ b/keyrings-filesystem.spec
@@ -1,6 +1,6 @@
 Name:           keyrings-filesystem
 Version:        1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Keyrings filesystem layout
 
 License:        Public Domain
@@ -22,19 +22,22 @@ This package provides the directory to store keyrings.
 
 %install
 # Directories
-install -d %{buildroot}%{_sysconfdir}/rpm
+install -d %{buildroot}%{_rpmconfigdir}/macros.d
 install -d %{buildroot}%{_datadir}/keyrings
 
 # RPM macro
-cat > %{buildroot}%{_sysconfdir}/rpm/macros.keyrings <<EOF
+cat > %{buildroot}%{_rpmconfigdir}/macros.d/macros.keyrings <<EOF
 %%_keyringsdir %%_datadir/keyrings
 EOF
 
 %files
 %dir %{_datadir}/keyrings
-%{_sysconfdir}/rpm/macros.keyrings
+%{_rpmconfigdir}/macros.d/macros.keyrings
 
 
 %changelog
+* Fri Jan 31 2014 Sandro Mani <manisandro at gmail.com> - 1-2
+- Install macros in %%{_rpmconfigdir}/macros.d
+
 * Mon Sep 23 2013 Sandro Mani <manisandro at gmail.com> - 1-1
 - Initial package


More information about the scm-commits mailing list