diff --git a/web-assets.conf b/httpd-web-assets.conf similarity index 100% rename from web-assets.conf rename to httpd-web-assets.conf diff --git a/web-assets.rpmlintrc b/web-assets.rpmlintrc new file mode 100644 index 0000000..0f36bfe --- /dev/null +++ b/web-assets.rpmlintrc @@ -0,0 +1,5 @@ +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 5913787..d08fae9 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -1,22 +1,19 @@ -#disable the httpd stuff while we're waiting on getting the path issues -#cleared up -%global enable_httpd 1 +%bcond_without httpd %bcond_without nginx Name: web-assets Version: 5 -Release: 15%{?dist} +Release: 26%{?dist} Summary: A simple framework for bits pushed to browsers -BuildArch: noarch - License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets - -Source1: LICENSE +Source0: LICENSE +Source1: README.devel Source2: macros.web-assets -Source3: web-assets.conf -Source4: README.devel -Source5: nginx-web-assets.conf +Source3: httpd-web-assets.conf +Source4: nginx-web-assets.conf +BuildArch: noarch +BuildRequires: coreutils %description %{summary}. @@ -24,7 +21,8 @@ Source5: nginx-web-assets.conf %package filesystem Summary: The basic directory layout for Web Assets #there's nothing copyrightable about a few directories and symlinks -License: Public Domain +License: LicenseRef-Not-Copyrightable +Requires: fonts-filesystem %description filesystem %{summary}. @@ -37,14 +35,12 @@ Requires: web-assets-filesystem = %{version}-%{release} %description devel %{summary}. -%if 0%{?enable_httpd} +%if %{with 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}. @@ -63,8 +59,8 @@ Requires: nginx %prep %setup -c -T -cp %{SOURCE1} LICENSE -cp %{SOURCE4} README.devel +cp %{SOURCE0} LICENSE +cp %{SOURCE1} README.devel %build #nothing to do @@ -72,28 +68,25 @@ cp %{SOURCE4} 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 %{SOURCE5} %{buildroot}%{_sysconfdir}/nginx/default.d/web-assets.conf +install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-assets.conf %endif -%if 0%{?enable_httpd} -install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf - +%if %{with httpd} %post httpd -systemctl reload-or-try-restart httpd.service || : +[ -x %{_bindir}/systemctl ] && reload-or-try-restart httpd.service || : %postun httpd -systemctl reload-or-try-restart httpd.service || : +[ -x %{_bindir}/systemctl ] && reload-or-try-restart httpd.service || : %endif - %if %{with nginx} %post nginx [ -x %{_bindir}/systemctl ] && systemctl reload-or-try-restart nginx.service || : @@ -111,7 +104,7 @@ systemctl reload-or-try-restart httpd.service || : %license LICENSE %doc README.devel -%if 0%{?enable_httpd} +%if %{with httpd} %files httpd %config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf %license LICENSE @@ -124,9 +117,42 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog -* Tue Mar 22 2022 Petr Menšík - 5-15 +* 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