[web-assets/el5: 2/2] Merge branch 'f18' into el5

[T.C. Hollingsworth]

commit ffaa65f3f4558c9fd5f03dc10b8dc100a33c1af7
Merge: 2528040 92a0ff5
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Aug 27 05:57:41 2013 -0700

    Merge branch 'f18' into el5
    
    Conflicts:
    	web-assets.spec

 web-assets.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc web-assets.spec
index 51ede2c,e38cdcd..47d7c48
--- a/web-assets.spec
+++ b/web-assets.spec
@@@ -4,11 -4,9 +4,11 @@@
  
  Name:           web-assets
  Version:        4
- Release:        2%{?dist}
+ Release:        3%{?dist}
  Summary:        A simple framework for bits pushed to browsers
 +Group:          System Environment/Base
  BuildArch:      noarch
 +BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  License:        MIT
  URL:            https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets
@@@ -92,8 -81,7 +92,9 @@@ systemctl reload-or-try-restart httpd.s
  %{_datadir}/javascript
  
  %files devel
 +%defattr(-,root,root,-)
 +%{_rpmconfigdir}/macros.d/macros.web-assets
+ %{_sysconfdir}/rpm/macros.web-assets
  %doc LICENSE README.devel
  
  %if 0%{?enable_httpd}