From fecd0ba93cac63865e4db3c88135f2810eafda58 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Tue, 30 Jul 2013 09:02:55 -0700 Subject: [PATCH] rename directories per discussion on lists --- macros.web-assets | 2 +- web-assets.conf | 8 ++++---- web-assets.spec | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/macros.web-assets b/macros.web-assets index 687751c..48ca9f9 100644 --- a/macros.web-assets +++ b/macros.web-assets @@ -1,4 +1,4 @@ -%_assetdir %{_datadir}/assets +%_webassetdir %{_datadir}/web-assets %_jsdir %{_datadir}/javascript %js_includes() %{expand: \ diff --git a/web-assets.conf b/web-assets.conf index ae0be44..626340e 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -1,13 +1,13 @@ -Alias /_assets /usr/share/assets +Alias /_sysassets /usr/share/web-assets - + Options -Indexes Require all granted -Alias /_assets/javascript /usr/share/javascript +Alias /_sysassets/javascript /usr/share/javascript - + Options -Indexes Require all granted diff --git a/web-assets.spec b/web-assets.spec index cb580ea..4dafdca 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -1,5 +1,5 @@ Name: web-assets -Version: 2 +Version: 3 Release: 1%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -49,11 +49,11 @@ cp %{SOURCE1} LICENSE #nothing to do %install -mkdir -p %{buildroot}%{_datadir}/assets +mkdir -p %{buildroot}%{_datadir}/web-assets mkdir -p %{buildroot}%{_datadir}/javascript -ln -sf ../javascript %{buildroot}%{_datadir}/assets/javascript -ln -sf ../fonts %{buildroot}%{_datadir}/assets/fonts +ln -sf ../javascript %{buildroot}%{_datadir}/web-assets/javascript +ln -sf ../fonts %{buildroot}%{_datadir}/web-assets/fonts install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.web-assets install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf @@ -65,7 +65,7 @@ systemctl reload-or-try-restart httpd.service || : systemctl reload-or-try-restart httpd.service || : %files filesystem -%{_datadir}/assets +%{_datadir}/web-assets %{_datadir}/javascript %files devel