silence service output in %post

Conflicts:
	web-assets.spec

web-assets.conf

@@ -37,7 +37,10 @@
     </IfModule>
 </Directory>
 
-Alias /.sysassets/fonts /usr/share/fonts
-Alias /.sysassets/javascript /usr/share/javascript
-Alias /.sysassets/js /usr/share/javascript
-Alias /.sysassets /usr/share/web-assets
+# These aliases are not made available by default on Fedora < 21 and EPEL < 7.
+# They will be available by default in Fedora >= 21 and EPEL >= 7.
+
+#Alias /.sysassets/fonts /usr/share/fonts
+#Alias /.sysassets/javascript /usr/share/javascript
+#Alias /.sysassets/js /usr/share/javascript
+#Alias /.sysassets /usr/share/web-assets

web-assets.spec

@@ -4,7 +4,7 @@
 
 Name:           web-assets
 Version:        5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A simple framework for bits pushed to browsers
 BuildArch:      noarch
 
@@ -41,8 +41,8 @@ Summary:        Web Assets aliases for the Apache HTTP daemon
 License:        MIT
 Requires:       web-assets-filesystem = %{version}-%{release}
 Requires:       httpd
-Requires(post): systemd
-Requires(postun): systemd
+Requires(post): initscripts
+Requires(postun): initscripts
 
 %description httpd
 %{summary}.
@@ -64,16 +64,16 @@ 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
 
 %post httpd
-systemctl reload-or-try-restart httpd.service || :
+service httpd reload >/dev/null 2>&1 || :
 
 %postun httpd
-systemctl reload-or-try-restart httpd.service || :
+service httpd reload >/dev/null 2>&1 || :
 %endif
 
 %files filesystem
@@ -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
+* Sat May 03 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 5-2
+- silence service output in %%post
+
 * Wed Mar 19 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 5-1
 - switch to dot-prefixed Aliases
 - order Aliases for compatibility with older Apache releases
@@ -98,6 +101,9 @@ systemctl reload-or-try-restart httpd.service || :
 - enable symlinks in %%{_webassetdir} and %%{_jsdir}
 - re-enable httpd subpackage
 
+* Tue Aug 27 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 4-3
+- use old location for RPM macros on older releases
+
 * Sat Aug 24 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 4-2
 - tighten dependency on filesystem from other packages
 - add brief README to -devel