Merge branch 'el6' into el5

silence service output in %post
2014-05-02 18:37:49 -07:00 · 2014-05-02 18:37:42 -07:00 · 2014-03-19 03:05:09 -07:00 · 2014-03-19 03:02:11 -07:00 · 2014-03-19 02:52:21 -07:00 · 2014-03-19 02:48:46 -07:00
4 changed files with 35 additions and 11 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+/dummy_source
--- a/1
+++ b/1
@ -0,0 +1 @@
+63662dfc530e3e04018ee8c02c7be260  dummy_source
--- a/web-assets.conf
+++ b/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
--- a/web-assets.spec
+++ b/web-assets.spec
@ -4,9 +4,11 @@

 Name:           web-assets
 Version:        5
-Release:        1%{?dist}
+Release:        2%{?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
@ -23,6 +25,7 @@ Source4:        README.devel
 Summary:        The basic directory layout for Web Assets
 #there's nothing copyrightable about a few directories and symlinks
 License:        Public Domain
+Group:          System Environment/Base

 %description filesystem
 %{summary}.
@ -31,6 +34,7 @@ License:        Public Domain
 Summary:        RPM macros for Web Assets packaging
 License:        MIT
 Requires:       web-assets-filesystem = %{version}-%{release}
+Group:          Development/System

 %description devel
 %{summary}.
@ -39,10 +43,11 @@ Requires:       web-assets-filesystem = %{version}-%{release}
 %package httpd
 Summary:        Web Assets aliases for the Apache HTTP daemon
 License:        MIT
+Group:          System Environment/Daemons
 Requires:       web-assets-filesystem = %{version}-%{release}
 Requires:       httpd
-Requires(post): systemd
-Requires(postun): systemd
+Requires(post): initscripts
+Requires(postun): initscripts

 %description httpd
 %{summary}.
@ -57,6 +62,8 @@ cp %{SOURCE4} README.devel
 #nothing to do

 %install
+rm -rf %{buildroot}
+
 mkdir -p %{buildroot}%{_datadir}/web-assets
 mkdir -p %{buildroot}%{_datadir}/javascript

@ -64,33 +71,42 @@ 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

+%clean
+rm -rf %{buildroot}
+
 %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
+%defattr(-,root,root,-)
 %{_datadir}/web-assets
 %{_datadir}/javascript

 %files devel
-%{_rpmconfigdir}/macros.d/macros.web-assets
+%defattr(-,root,root,-)
+%{_sysconfdir}/rpm/macros.web-assets
 %doc LICENSE README.devel

 %if 0%{?enable_httpd}
+%defattr(-,root,root,-)
 %files httpd
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf
 %doc LICENSE
 %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 +114,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
Author	SHA1	Message	Date
T.C. Hollingsworth	73a36b1f6a	Merge branch 'el6' into el5	2014-05-02 18:37:49 -07:00
T.C. Hollingsworth	d3da6d63ae	silence service output in %post	2014-05-02 18:37:42 -07:00
T.C. Hollingsworth	3404fc6b4d	Merge branch 'el6' into el5	2014-03-19 03:05:09 -07:00
T.C. Hollingsworth	6f0f8122bc	use sysvinit commands instead of systemd commands	2014-03-19 03:02:11 -07:00
T.C. Hollingsworth	d014f35517	Merge branch 'f20' into el6 Conflicts: web-assets.spec	2014-03-19 02:52:21 -07:00
T.C. Hollingsworth	fe2c577a93	do not make Aliases available in stable releases	2014-03-19 02:48:46 -07:00
T.C. Hollingsworth	0c1b49da49	remove duplicated line thanks git for not merging properly	2013-08-27 06:10:04 -07:00
T.C. Hollingsworth	ffaa65f3f4	Merge branch 'f18' into el5 Conflicts: web-assets.spec	2013-08-27 05:57:41 -07:00
T.C. Hollingsworth	92a0ff5789	use old location for RPM macros on older releases	2013-08-27 05:56:19 -07:00
T.C. Hollingsworth	25280401f7	add Groups to subpackages that was the real problem. thanks koji for the misleading error :-(	2013-08-27 05:44:40 -07:00
T.C. Hollingsworth	0922d17eff	add a dummy source to make the EL5 build happy	2013-08-27 05:41:31 -07:00
T.C. Hollingsworth	c4867f1c45	add EL5 compatibility stuff	2013-08-27 05:22:48 -07:00
				`@ -0,0 +1 @@`
				`63662dfc530e3e04018ee8c02c7be260 dummy_source`