diff --git a/httpd-web-assets.conf b/httpd-web-assets.conf deleted file mode 100644 index 94784a7..0000000 --- a/httpd-web-assets.conf +++ /dev/null @@ -1,43 +0,0 @@ - - Options -Indexes +FollowSymLinks - - # Apache 2.4 - Require all granted - - - # Apache 2.2 - Order deny,allow - Allow from all - - - - - Options -Indexes +FollowSymLinks - - # Apache 2.4 - Require all granted - - - # Apache 2.2 - Order deny,allow - Allow from all - - - - - Options -Indexes - - # Apache 2.4 - Require all granted - - - # Apache 2.2 - Order deny,allow - Allow from all - - - -Alias /.sysassets/fonts /usr/share/fonts -Alias /.sysassets/javascript /usr/share/javascript -Alias /.sysassets/js /usr/share/javascript -Alias /.sysassets /usr/share/web-assets \ No newline at end of file diff --git a/nginx-web-assets.conf b/nginx-web-assets.conf deleted file mode 100644 index 6b2b0d0..0000000 --- a/nginx-web-assets.conf +++ /dev/null @@ -1,21 +0,0 @@ -# allow access to /.sysassets - -location /.sysassets/fonts { - alias /usr/share/fonts; - autoindex off; -} - -location /.sysassets/javascript { - alias /usr/share/javascript; - autoindex off; -} - -location /.sysassets/js { - alias /usr/share/javascript; - autoindex off; -} - -location /.sysassets/ { - alias /usr/share/web-assets; - autoindex off; -} diff --git a/web-assets.conf b/web-assets.conf new file mode 100644 index 0000000..4fa3719 --- /dev/null +++ b/web-assets.conf @@ -0,0 +1,14 @@ +Alias /_sysassets /usr/share/web-assets + + + Options -Indexes + Require all granted + + +Alias /_sysassets/javascript /usr/share/javascript +Alias /_sysassets/js /usr/share/javascript + + + Options -Indexes + Require all granted + diff --git a/web-assets.rpmlintrc b/web-assets.rpmlintrc deleted file mode 100644 index 0f36bfe..0000000 --- a/web-assets.rpmlintrc +++ /dev/null @@ -1,5 +0,0 @@ -addFilter('web-assets-filesystem\.noarch: W: no-documentation') -# The target is provided by fonts-filesystem. -addFilter('web-assets-filesystem\.noarch: W: dangling-relative-symlink /usr/share/web-assets/fonts \.\./fonts') -# RPM macros live in /usr/lib. -addFilter('web-assets-devel\.noarch: W: only-non-binary-in-usr-lib') diff --git a/web-assets.spec b/web-assets.spec index 4beba56..e38cdcd 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -1,19 +1,20 @@ -%bcond_without httpd -%bcond_without nginx +#disable the httpd stuff while we're waiting on getting the path issues +#cleared up +%global enable_httpd 0 Name: web-assets -Version: 5 -Release: 27%{?dist} +Version: 4 +Release: 3%{?dist} Summary: A simple framework for bits pushed to browsers +BuildArch: noarch + License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets -Source0: LICENSE -Source1: README.devel + +Source1: LICENSE Source2: macros.web-assets -Source3: httpd-web-assets.conf -Source4: nginx-web-assets.conf -BuildArch: noarch -BuildRequires: coreutils +Source3: web-assets.conf +Source4: README.devel %description %{summary}. @@ -21,8 +22,7 @@ BuildRequires: coreutils %package filesystem Summary: The basic directory layout for Web Assets #there's nothing copyrightable about a few directories and symlinks -License: LicenseRef-Not-Copyrightable -Requires: fonts-filesystem +License: Public Domain %description filesystem %{summary}. @@ -35,32 +35,23 @@ Requires: web-assets-filesystem = %{version}-%{release} %description devel %{summary}. -%if %{with httpd} +%if 0%{?enable_httpd} %package httpd 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 %description httpd %{summary}. %endif -%if %{with nginx} -%package nginx -Summary: Web Assets aliases for the nginx daemon -License: MIT -Requires: web-assets-filesystem = %{version}-%{release} -Requires: nginx - -%description nginx -%{summary}. -%endif - %prep %setup -c -T -cp %{SOURCE0} LICENSE -cp %{SOURCE1} README.devel +cp %{SOURCE1} LICENSE +cp %{SOURCE4} README.devel %build #nothing to do @@ -68,31 +59,21 @@ cp %{SOURCE1} README.devel %install mkdir -p %{buildroot}%{_datadir}/web-assets mkdir -p %{buildroot}%{_datadir}/javascript + 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 -%if %{with httpd} -install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf -%endif -%if %{with nginx} -install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-assets.conf -%endif -%if %{with httpd} +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 -[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart httpd.service || : +systemctl reload-or-try-restart httpd.service || : %postun httpd -[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart httpd.service || : -%endif - -%if %{with nginx} -%post nginx -[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart nginx.service || : - -%postun nginx -[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart nginx.service || : +systemctl reload-or-try-restart httpd.service || : %endif %files filesystem @@ -100,107 +81,18 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %{_datadir}/javascript %files devel -%{_rpmconfigdir}/macros.d/macros.web-assets -%license LICENSE -%doc README.devel +%{_sysconfdir}/rpm/macros.web-assets +%doc LICENSE README.devel -%if %{with httpd} +%if 0%{?enable_httpd} %files httpd %config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf -%license LICENSE -%endif - -%if %{with nginx} -%files nginx -%config(noreplace) %{_sysconfdir}/nginx/default.d/web-assets.conf -%license LICENSE +%doc LICENSE %endif %changelog -* Wed Sep 02 2026 Petr Pisar - 5-27 -- Fix restarting systemd services - -* Fri Jul 17 2026 Fedora Release Engineering - 5-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 5-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 5-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 5-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 5-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 5-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 5-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 5-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 5-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Mar 23 2022 Petr Pisar - 5-17 -- Make a dependency on systemd optional for restarting httpd - -* Tue Mar 22 2022 Petr Menšík - 5-16 -- Add nginx aliases support - -* Sat Jan 22 2022 Fedora Release Engineering - 5-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 5-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 5-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Mar 19 2014 T.C. Hollingsworth - 5-1 -- switch to dot-prefixed Aliases -- order Aliases for compatibility with older Apache releases -- enable webfonts -- enable symlinks in %%{_webassetdir} and %%{_jsdir} -- re-enable httpd subpackage +* Tue Aug 27 2013 T.C. Hollingsworth - 4-3 +- use old location for RPM macros on older releases * Sat Aug 24 2013 T.C. Hollingsworth - 4-2 - tighten dependency on filesystem from other packages