[web-assets/el5: 1/2] use old location for RPM macros on older releases

T.C. Hollingsworth patches at fedoraproject.org
Tue Aug 27 12:58:38 UTC 2013


commit 92a0ff5789312bf852ebab319dcd94bb2704eb91
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Aug 27 05:56:19 2013 -0700

    use old location for RPM macros on older releases

 web-assets.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/web-assets.spec b/web-assets.spec
index a64925d..e38cdcd 100644
--- a/web-assets.spec
+++ b/web-assets.spec
@@ -4,7 +4,7 @@
 
 Name:           web-assets
 Version:        4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A simple framework for bits pushed to browsers
 BuildArch:      noarch
 
@@ -64,7 +64,7 @@ ln -sf ../javascript %{buildroot}%{_datadir}/web-assets/javascript
 ln -sf ../javascript %{buildroot}%{_datadir}/web-assets/js
 ln -sf ../fonts %{buildroot}%{_datadir}/web-assets/fonts
 
-install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.web-assets
+install -Dpm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.web-assets
 
 %if 0%{?enable_httpd}
 install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf
@@ -81,7 +81,7 @@ systemctl reload-or-try-restart httpd.service || :
 %{_datadir}/javascript
 
 %files devel
-%{_rpmconfigdir}/macros.d/macros.web-assets
+%{_sysconfdir}/rpm/macros.web-assets
 %doc LICENSE README.devel
 
 %if 0%{?enable_httpd}
@@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || :
 %endif
 
 %changelog
+* Tue Aug 27 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 4-3
+- use old location for RPM macros on older releases
+
 * Sat Aug 24 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 4-2
 - tighten dependency on filesystem from other packages
 - add brief README to -devel


More information about the scm-commits mailing list