[ros-release/f19] Install RPM macros to rpmconfigdir

rmattes rmattes at fedoraproject.org
Sat Feb 8 23:36:09 UTC 2014


commit 11731e4e83f5ac3f0222394d1aef2f5ace6ff621
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sat Feb 8 17:38:11 2014 -0500

    Install RPM macros to rpmconfigdir
    
    Conflicts:
    	ros-release.spec

 ros-release.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ros-release.spec b/ros-release.spec
index 3a75f67..21689a3 100644
--- a/ros-release.spec
+++ b/ros-release.spec
@@ -2,7 +2,7 @@
 
 Name:           ros-release
 Version:        5.0
-Release:        2%{?dist}
+Release:        3%{?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}%{_sysconfdir}/rpm
-cat >> %{buildroot}/etc/rpm/macros.ros << EOF
+install -d %{buildroot}%{_rpmconfigdir}
+cat >> %{buildroot}%{_rpmconfigdir}/macros.ros << EOF
 # ROS Macros
 
 %%rosrelease              %{rosrelease}
@@ -37,9 +37,12 @@ EOF
 %dir %{_sysconfdir}/ros
 %{_datadir}/ros
 %config(noreplace) %{_sysconfdir}/ros-release
-%{_sysconfdir}/rpm/macros.ros
+%{_rpmconfigdir}/macros.ros
 
 %changelog
+* Sat Feb 08 2014 Rich Mattes <richmattes at gmail.com> - 5.0-3
+- Install RPM macros to rpmconfigdir
+
 * Mon Mar 11 2013 Ralf Corsépius <corsepiu at fedoraproject.org> - 5.0-2
 - Remove %%config from %%{_sysconfdir}/rpm/macros.*
   (https://fedorahosted.org/fpc/ticket/259).


More information about the scm-commits mailing list