[web-assets/el5: 11/15] temporarily disable httpd stuff while we're waiting on sorting out the

T.C. Hollingsworth patches at fedoraproject.org
Tue Aug 27 12:25:01 UTC 2013


commit 21254af28f84a4f0dc143178e3308c25ce776981
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Thu Aug 15 18:42:12 2013 -0700

    temporarily disable httpd stuff while we're waiting on sorting out the
    
      directory

 web-assets.spec |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/web-assets.spec b/web-assets.spec
index 5be27a5..5353d58 100644
--- a/web-assets.spec
+++ b/web-assets.spec
@@ -1,5 +1,9 @@
+#disable the httpd stuff while we're waiting on getting the path issues
+#cleared up
+%global enable_httpd 0
+
 Name:           web-assets
-Version:        3
+Version:        4
 Release:        1%{?dist}
 Summary:        A simple framework for bits pushed to browsers
 BuildArch:      noarch
@@ -30,6 +34,7 @@ Requires:       web-assets-filesystem
 %description devel
 %{summary}.
 
+%if 0%{?enable_httpd}
 %package httpd
 Summary:        Web Assets aliases for the Apache HTTP daemon
 License:        MIT
@@ -40,6 +45,7 @@ Requires(postun): systemd
 
 %description httpd
 %{summary}.
+%endif
 
 %prep
 %setup -c -T
@@ -57,6 +63,8 @@ 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
+
+%if 0%{?enable_httpd}
 install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf
 
 %post httpd
@@ -64,6 +72,7 @@ systemctl reload-or-try-restart httpd.service || :
 
 %postun httpd
 systemctl reload-or-try-restart httpd.service || :
+%endif
 
 %files filesystem
 %{_datadir}/web-assets
@@ -73,11 +82,17 @@ systemctl reload-or-try-restart httpd.service || :
 %{_rpmconfigdir}/macros.d/macros.web-assets
 %doc LICENSE
 
+%if 0%{?enable_httpd}
 %files httpd
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf
 %doc LICENSE
+%endif
 
 %changelog
+* Fri Aug 16 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 4-1
+- temporarily disable httpd stuff while we're waiting on sorting out the
+  directory
+
 * Tue Jul 30 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 3-1
 - rename directories per discussion on lists
 - provide a /_sysassets/js shortcut


More information about the scm-commits mailing list