From aa922d14c6a979be30a36eddc59e12935f988f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 23 Mar 2022 10:08:19 +0100 Subject: [PATCH 01/11] Unify httpd and nginx packaging This makes the spec file more uniform. A change is that the post and postun scripts for httpd do not pull in systemd. An httpd.service is restarted only if systemd has already been installed. This makes a systemd-less container easier. (The ball is on httpd side now.) This patch also fixes few missing dependencies. --- web-assets.conf => httpd-web-assets.conf | 0 web-assets.rpmlintrc | 5 +++ web-assets.spec | 50 +++++++++++------------- 3 files changed, 28 insertions(+), 27 deletions(-) rename web-assets.conf => httpd-web-assets.conf (100%) create mode 100644 web-assets.rpmlintrc 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 3280029..918e7fe 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: 16%{?dist} +Release: 17%{?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}. @@ -25,6 +22,7 @@ Source5: nginx-web-assets.conf Summary: The basic directory layout for Web Assets #there's nothing copyrightable about a few directories and symlinks License: Public Domain +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,6 +117,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 9180d19774b9dc55ccb98787f4fdca41e102e162 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:17:46 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 918e7fe..ce88c42 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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 From d834af2ce299877ef2332f94b95c44480e500451 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:41:48 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index ce88c42..21500eb 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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 From 546069c52fae4f5b4cf2ef633b0d8dffa857886d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:04:19 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 21500eb..2c3bb70 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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 From efb6c383c4be2d56918ed7c62c3c31ebcb3596a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:32:05 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 2c3bb70..0145ab9 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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 From 745c10cc18dc83912d17eb0d8061fbbb9a14ba57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:12:35 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 0145ab9..03bb229 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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 From 9a3c2eaa7697a18480c4aa2e198f64e86ce74573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 19 Sep 2024 06:20:52 +0000 Subject: [PATCH 07/11] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 If there will be no comments in two weeks, I will merge this. --- web-assets.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 03bb229..3427d1a 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -21,7 +21,7 @@ BuildRequires: coreutils %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 From 08ed0cc79cfe627a8e93a61c564f72bdb01ba603 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:51:28 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 3427d1a..5f37ba7 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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 From 2bb02e5f02e26f169f578dbe31f6a8e4fa396db7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:20:30 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 5f37ba7..f2d20bf 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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 From 37b64566879f68181e43adb33a4d93562dc8302a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:10:07 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index f2d20bf..5bcd1f7 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 24%{?dist} +Release: 25%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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 From 6f1bf769ef62cd82827b33b2ee6d8e0c3d5497b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:44:25 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 5bcd1f7..d08fae9 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,7 +3,7 @@ Name: web-assets Version: 5 -Release: 25%{?dist} +Release: 26%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -117,6 +117,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* 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