From 6d27e2cc9e4ced3342c0d9445c501606f760849c Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Feb 09 2014 16:55:32 +0000
Subject: Install RPM macros to rpmconfigdir macros.d subdirectory


---

diff --git a/ros-release.spec b/ros-release.spec
index e4bf48f..a9c9537 100644
--- a/ros-release.spec
+++ b/ros-release.spec
@@ -2,7 +2,7 @@
 
 Name:           ros-release
 Version:        5.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Robot Operating System release files
 
 Group:          Development/Libraries
@@ -26,8 +26,8 @@ cat >> %{buildroot}%{_sysconfdir}/ros-release << EOF
 ROS %{rosrelease} (Fuerte Turtle)
 EOF
 
-install -d %{buildroot}%{_rpmconfigdir}
-cat >> %{buildroot}%{_rpmconfigdir}/macros.ros << EOF
+install -d %{buildroot}%{_rpmconfigdir}/macros.d
+cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.ros << EOF
 # ROS Macros
 
 %%rosrelease              %{rosrelease}
@@ -37,9 +37,12 @@ EOF
 %dir %{_sysconfdir}/ros
 %{_datadir}/ros
 %config(noreplace) %{_sysconfdir}/ros-release
-%{_rpmconfigdir}/macros.ros
+%{_rpmconfigdir}/macros.d/macros.ros
 
 %changelog
+* Sun Feb 09 2014 Rich Mattes <richmattes@gmail.com> - 5.0-5
+- Install RPM macros to rpmconfigdir macros.d subdirectory
+
 * Sat Feb 08 2014 Rich Mattes <richmattes@gmail.com> - 5.0-4
 - Install RPM macros to rpmconfigdir