From 77c6df909d4ccd879ad200c356daae5f75f56bbe Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Fri, 19 Jul 2013 04:26:37 -0700 Subject: [PATCH 01/48] a star is born --- macros.web-assets | 13 ++++++++ sources | 0 web-assets-LICENSE | 19 +++++++++++ web-assets.conf | 5 +++ web-assets.spec | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 119 insertions(+) create mode 100644 macros.web-assets create mode 100644 sources create mode 100644 web-assets-LICENSE create mode 100644 web-assets.conf create mode 100644 web-assets.spec diff --git a/macros.web-assets b/macros.web-assets new file mode 100644 index 0000000..687751c --- /dev/null +++ b/macros.web-assets @@ -0,0 +1,13 @@ +%_assetdir %{_datadir}/assets +%_jsdir %{_datadir}/javascript + +%js_includes() %{expand: \ +%( + ver=$(rpm -q --qf='%%{version}' -- %1) + if [[ $? -eq 0 ]]; then + echo "Provides: js-includes(%1) = $ver" + else + echo "Provides: js-includes(%1)" + fi +) +} diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 diff --git a/web-assets-LICENSE b/web-assets-LICENSE new file mode 100644 index 0000000..17597ed --- /dev/null +++ b/web-assets-LICENSE @@ -0,0 +1,19 @@ +Copyright 2013 T.C. Hollingsworth + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +IN THE SOFTWARE. diff --git a/web-assets.conf b/web-assets.conf new file mode 100644 index 0000000..90732e9 --- /dev/null +++ b/web-assets.conf @@ -0,0 +1,5 @@ +Alias /assets /usr/share/assets + + + Options -Indexes + diff --git a/web-assets.spec b/web-assets.spec new file mode 100644 index 0000000..0809317 --- /dev/null +++ b/web-assets.spec @@ -0,0 +1,82 @@ +Name: web-assets +Version: 1 +Release: 1%{?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: web-assets-LICENSE +Source2: macros.web-assets +Source3: web-assets.conf + +%description +%{summary}. + +%package filesystem +Summary: The basic directory layout for Web Assets +#there's nothing copyrightable about a few directories and symlinks +License: Public Domain + +%description filesystem +%{summary}. + +%package devel +Summary: RPM macros for Web Assets packaging +License: MIT +Requires: web-assets-filesystem + +%description devel +%{summary}. + +%package httpd +Summary: Web Assets aliases for the Apache HTTP daemon +License: MIT +Requires: web-assets-filesystem +Requires: httpd +Requires(post): systemd +Requires(postun): systemd + +%description httpd +%{summary}. + +%prep +%setup -c -T +cp %{SOURCE2} LICENSE + +%build +#nothing to do + +%install +mkdir -p %{buildroot}%{_datadir}/assets +mkdir -p %{buildroot}%{_datadir}/javascript + +ln -sf ../javascript %{buildroot}%{_datadir}/assets/javascript +ln -sf ../fonts %{buildroot}%{_datadir}/assets/fonts + +install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.web-assets +install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf + +%post httpd +systemctl reload-or-try-restart httpd.service || : + +%postun httpd +systemctl reload-or-try-restart httpd.service || : + +%files filesystem +%{_datadir}/assets +%{_datadir}/javascript + +%files devel +%{_rpmconfigdir}/macros.d/macros.web-assets +%doc LICENSE + +%files httpd +%config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf +%doc LICENSE + +%changelog +* Thu Jul 11 2013 T.C. Hollingsworth - 1-1 +- initial package + From 54b5384e316ef33ca6b90d8ede28ce23faa320bc Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Fri, 19 Jul 2013 04:29:31 -0700 Subject: [PATCH 02/48] rename the license now that we have proper git --- web-assets-LICENSE => LICENSE | 0 web-assets.spec | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename web-assets-LICENSE => LICENSE (100%) diff --git a/web-assets-LICENSE b/LICENSE similarity index 100% rename from web-assets-LICENSE rename to LICENSE diff --git a/web-assets.spec b/web-assets.spec index 0809317..e44a164 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -7,7 +7,7 @@ BuildArch: noarch License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets -Source1: web-assets-LICENSE +Source1: LICENSE Source2: macros.web-assets Source3: web-assets.conf @@ -43,7 +43,7 @@ Requires(postun): systemd %prep %setup -c -T -cp %{SOURCE2} LICENSE +cp %{SOURCE1} LICENSE %build #nothing to do From 6cb795fad57f3b4106034e55b2ebb57996f58429 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Fri, 19 Jul 2013 04:30:03 -0700 Subject: [PATCH 03/48] prefix httpd-exported directory with an underscore as suggest by Joe Orton on --- web-assets.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-assets.conf b/web-assets.conf index 90732e9..f320a4b 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -1,4 +1,4 @@ -Alias /assets /usr/share/assets +Alias /_assets /usr/share/assets Options -Indexes From 08a84bd9f3fadbc33602a09c2480a3aa49dd2927 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Fri, 19 Jul 2013 04:33:02 -0700 Subject: [PATCH 04/48] add "Require all granted" as suggested by Remi Collet --- web-assets.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/web-assets.conf b/web-assets.conf index f320a4b..57027fd 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -2,4 +2,5 @@ Alias /_assets /usr/share/assets Options -Indexes + Require all granted From 74a19dd4c116a8ea148ef2691de0d8a04ab5fe06 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Fri, 19 Jul 2013 04:34:09 -0700 Subject: [PATCH 05/48] alias %{_jsdir} explicitly fonts will come next, but they're going to need more magic --- web-assets.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web-assets.conf b/web-assets.conf index 57027fd..ae0be44 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -4,3 +4,10 @@ Alias /_assets /usr/share/assets Options -Indexes Require all granted + +Alias /_assets/javascript /usr/share/javascript + + + Options -Indexes + Require all granted + From 45164ba7aea62ab91dc95792a9457bbfb1ecf793 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Fri, 19 Jul 2013 04:36:54 -0700 Subject: [PATCH 06/48] web-assets-2 --- web-assets.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web-assets.spec b/web-assets.spec index e44a164..cb580ea 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -1,5 +1,5 @@ Name: web-assets -Version: 1 +Version: 2 Release: 1%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -77,6 +77,11 @@ systemctl reload-or-try-restart httpd.service || : %doc LICENSE %changelog +* Fri Jul 19 2013 T.C. Hollingsworth - 2-1 +- rename the license now that we have proper git +- prefix httpd-exported directory with an underscore (thanks to Joe Orton) +- add "Require all granted" (thanks to Remi Collet) +- alias /usr/share/javascript explictly + * Thu Jul 11 2013 T.C. Hollingsworth - 1-1 - initial package - From 5f8360475376b1feb0beb4a88873a182591578a2 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Fri, 19 Jul 2013 04:48:23 -0700 Subject: [PATCH 07/48] add some instructions --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..3a3e587 --- /dev/null +++ b/README.md @@ -0,0 +1,19 @@ +one directory to rule them all +============================== + +For more information, see the +[proposal](https://fedoraproject.org/Changes/Web_Assets) and +[proposed guidelines](https://fedoraproject.org/User:Patches/PackagingDrafts/Web_Assets) + +Try Me +------ + +```sh +sudo yum install git fedora-packager +git clone https://github.com/tchollingsworth/fedora-web-assets +cd fedora-web-assets +fedpkg --dist=f19 local +sudo yum install noarch/* +``` + +[There are also some builds here.](http://patches.fedorapeople.org/web-assets/) From fecd0ba93cac63865e4db3c88135f2810eafda58 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Tue, 30 Jul 2013 09:02:55 -0700 Subject: [PATCH 08/48] 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 From dcb45c11a116b0b938e1b9d3242556e7707f5ef8 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Tue, 30 Jul 2013 09:09:13 -0700 Subject: [PATCH 09/48] provide a /_sysassets/js shortcut --- web-assets.conf | 1 + web-assets.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/web-assets.conf b/web-assets.conf index 626340e..4fa3719 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -6,6 +6,7 @@ Alias /_sysassets /usr/share/web-assets Alias /_sysassets/javascript /usr/share/javascript +Alias /_sysassets/js /usr/share/javascript Options -Indexes diff --git a/web-assets.spec b/web-assets.spec index 4dafdca..91672b5 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -53,6 +53,7 @@ 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 From 51f669ec184836cc5ac8e33257adaa55c1b9cb98 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Tue, 30 Jul 2013 09:10:56 -0700 Subject: [PATCH 10/48] web-assets-3 --- web-assets.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web-assets.spec b/web-assets.spec index 91672b5..5be27a5 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -78,6 +78,10 @@ systemctl reload-or-try-restart httpd.service || : %doc LICENSE %changelog +* Tue Jul 30 2013 T.C. Hollingsworth - 3-1 +- rename directories per discussion on lists +- provide a /_sysassets/js shortcut + * Fri Jul 19 2013 T.C. Hollingsworth - 2-1 - rename the license now that we have proper git - prefix httpd-exported directory with an underscore (thanks to Joe Orton) From 21254af28f84a4f0dc143178e3308c25ce776981 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Thu, 15 Aug 2013 18:42:12 -0700 Subject: [PATCH 11/48] temporarily disable httpd stuff while we're waiting on sorting out the directory --- web-assets.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 - 4-1 +- temporarily disable httpd stuff while we're waiting on sorting out the + directory + * Tue Jul 30 2013 T.C. Hollingsworth - 3-1 - rename directories per discussion on lists - provide a /_sysassets/js shortcut From 54bd96066ff5c7e72151401cc940b73f1e8bdcfd Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Sat, 24 Aug 2013 11:33:14 -0700 Subject: [PATCH 12/48] tighten dependency on filesystem from other packages --- web-assets.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web-assets.spec b/web-assets.spec index 5353d58..9be4952 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -29,7 +29,7 @@ License: Public Domain %package devel Summary: RPM macros for Web Assets packaging License: MIT -Requires: web-assets-filesystem +Requires: web-assets-filesystem = %{version}-%{release} %description devel %{summary}. @@ -38,7 +38,7 @@ Requires: web-assets-filesystem %package httpd Summary: Web Assets aliases for the Apache HTTP daemon License: MIT -Requires: web-assets-filesystem +Requires: web-assets-filesystem = %{version}-%{release} Requires: httpd Requires(post): systemd Requires(postun): systemd @@ -89,6 +89,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* Sat Aug 24 2013 T.C. Hollingsworth - 4-2 +- tighten dependency on filesystem from other packages + * Fri Aug 16 2013 T.C. Hollingsworth - 4-1 - temporarily disable httpd stuff while we're waiting on sorting out the directory From 62e5d15bcd32763499618e28e6375b4dc4d156da Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Sat, 24 Aug 2013 11:34:51 -0700 Subject: [PATCH 13/48] add brief README to devel --- README.devel | 8 ++++++++ web-assets.spec | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 README.devel diff --git a/README.devel b/README.devel new file mode 100644 index 0000000..b281843 --- /dev/null +++ b/README.devel @@ -0,0 +1,8 @@ +web-assets-devel contains the RPM macros that implement the Fedora Web Assets +and JavaScript packaging policies. + +For more information on packaging Web Assets, see: +https://fedoraproject.org/wiki/Packaging:Web_Assets + +For more information on packaging JavaScript, see: +https://fedoraproject.org/wiki/Packaging:JavaScript diff --git a/web-assets.spec b/web-assets.spec index 9be4952..a64925d 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -14,6 +14,7 @@ URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_ Source1: LICENSE Source2: macros.web-assets Source3: web-assets.conf +Source4: README.devel %description %{summary}. @@ -50,6 +51,7 @@ Requires(postun): systemd %prep %setup -c -T cp %{SOURCE1} LICENSE +cp %{SOURCE4} README.devel %build #nothing to do @@ -80,7 +82,7 @@ systemctl reload-or-try-restart httpd.service || : %files devel %{_rpmconfigdir}/macros.d/macros.web-assets -%doc LICENSE +%doc LICENSE README.devel %if 0%{?enable_httpd} %files httpd @@ -91,6 +93,7 @@ systemctl reload-or-try-restart httpd.service || : %changelog * Sat Aug 24 2013 T.C. Hollingsworth - 4-2 - tighten dependency on filesystem from other packages +- add brief README to -devel * Fri Aug 16 2013 T.C. Hollingsworth - 4-1 - temporarily disable httpd stuff while we're waiting on sorting out the From b0d254d469bfcaf614e3632c721e1bfd9562276a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 26 Aug 2013 12:23:26 +0000 Subject: [PATCH 14/48] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From b1dd16e6e21595ca16e113adfe40cdd8e2a8a7fa Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Tue, 27 Aug 2013 16:40:11 -0700 Subject: [PATCH 15/48] add Apache 2.2 support to httpd config thanks to Remi Collet --- web-assets.conf | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/web-assets.conf b/web-assets.conf index 4fa3719..d35b3a4 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -2,7 +2,15 @@ Alias /_sysassets /usr/share/web-assets Options -Indexes - Require all granted + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + Alias /_sysassets/javascript /usr/share/javascript @@ -10,5 +18,13 @@ Alias /_sysassets/js /usr/share/javascript Options -Indexes - Require all granted + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + From fb7f749d14cd13f0a5c06c7354eabcc2df25fe86 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 19 Mar 2014 02:26:06 -0700 Subject: [PATCH 16/48] switch to dot-prefixed Aliases --- web-assets.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web-assets.conf b/web-assets.conf index d35b3a4..84033c1 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -1,4 +1,4 @@ -Alias /_sysassets /usr/share/web-assets +Alias /.sysassets /usr/share/web-assets Options -Indexes @@ -13,8 +13,8 @@ Alias /_sysassets /usr/share/web-assets -Alias /_sysassets/javascript /usr/share/javascript -Alias /_sysassets/js /usr/share/javascript +Alias /.sysassets/javascript /usr/share/javascript +Alias /.sysassets/js /usr/share/javascript Options -Indexes From 25205cfbf7dd59ab0bf332467db15301822f0e15 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 19 Mar 2014 02:26:46 -0700 Subject: [PATCH 17/48] order Aliases for compatibility with older Apache releases thanks to Remi Collet --- web-assets.conf | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/web-assets.conf b/web-assets.conf index 84033c1..be4a3b1 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -1,5 +1,3 @@ -Alias /.sysassets /usr/share/web-assets - Options -Indexes @@ -13,18 +11,19 @@ Alias /.sysassets /usr/share/web-assets + + Options -Indexes + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + + + Alias /.sysassets/javascript /usr/share/javascript Alias /.sysassets/js /usr/share/javascript - - - Options -Indexes - - # Apache 2.4 - Require all granted - - - # Apache 2.2 - Order deny,allow - Allow from all - - +Alias /.sysassets /usr/share/web-assets \ No newline at end of file From 1c1b6bc7bae779943b1d308b775da83d8b9bcb6f Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 19 Mar 2014 02:33:10 -0700 Subject: [PATCH 18/48] enable webfonts --- web-assets.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web-assets.conf b/web-assets.conf index be4a3b1..a6a14c0 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -24,6 +24,20 @@ + + 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 From 4ab8661d39faa2def35b8a531f03a67d1b384b60 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 19 Mar 2014 02:35:41 -0700 Subject: [PATCH 19/48] enable symlinks in %{_webassetdir} and %{_jsdir} --- web-assets.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web-assets.conf b/web-assets.conf index a6a14c0..94784a7 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -1,5 +1,5 @@ - Options -Indexes + Options -Indexes +FollowSymLinks # Apache 2.4 Require all granted @@ -12,7 +12,7 @@ - Options -Indexes + Options -Indexes +FollowSymLinks # Apache 2.4 Require all granted From d1f169aa54d9825cc4399720e0a2a23494890647 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 19 Mar 2014 02:38:20 -0700 Subject: [PATCH 20/48] re-enable httpd subpackage --- web-assets.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index a64925d..1de86cb 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -1,6 +1,6 @@ #disable the httpd stuff while we're waiting on getting the path issues #cleared up -%global enable_httpd 0 +%global enable_httpd 1 Name: web-assets Version: 4 From 6a358b51ddd2425de93b22af60a532f3a52f8bd2 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 19 Mar 2014 02:40:47 -0700 Subject: [PATCH 21/48] web-assets-5-1 --- web-assets.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/web-assets.spec b/web-assets.spec index 1de86cb..e7e39b5 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -3,8 +3,8 @@ %global enable_httpd 1 Name: web-assets -Version: 4 -Release: 2%{?dist} +Version: 5 +Release: 1%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,13 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 + * Sat Aug 24 2013 T.C. Hollingsworth - 4-2 - tighten dependency on filesystem from other packages - add brief README to -devel From 8b854acfe715c8efd86a06fb8c48e84c91bfe030 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:18:27 -0500 Subject: [PATCH 22/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index e7e39b5..b74e9bf 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 5c041effe5b70b5497c52ce9661cf163df062a38 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:18:16 +0000 Subject: [PATCH 23/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index b74e9bf..4b627aa 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 645b542ce91aab4f27bec30aa4e24146753af774 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:56:10 +0000 Subject: [PATCH 24/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 4b627aa..4932e11 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 332f9f7653db8f5fcf39ca5441de8ecb8ddd59fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:17:31 +0000 Subject: [PATCH 25/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 4932e11..9599d08 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 4cfe7e992a2772297b5f6af7523952071fcd05df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:32:02 +0000 Subject: [PATCH 26/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index 9599d08..44eff8c 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 116c211af0057b7aa38cd7a3d1b1991754ea75b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:48:54 +0000 Subject: [PATCH 27/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 44eff8c..c4e1a02 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 7a98752c442352309222f3fdcc70ae7331a2f15b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:45:34 +0000 Subject: [PATCH 28/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 c4e1a02..e7fc48a 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 3c12a570632a1a45b9105950f0ae37317530b0b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:35:45 +0000 Subject: [PATCH 29/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 e7fc48a..07d1ebb 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 6b8386058961e7a2c108220197d74b7cf3a50fad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:20:43 +0000 Subject: [PATCH 30/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 07d1ebb..ff02de2 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 17e211aed4404474a02cc76b624b033d4020f69e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:34:04 +0000 Subject: [PATCH 31/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 ff02de2..30f4451 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 7f330215846fd1c161cacb3598675eba4aed34cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:02:13 +0000 Subject: [PATCH 32/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 30f4451..018ad2f 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From f70ffdfce1f26e3686d5ad84f6b07edaaa3c9c4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:23:37 +0000 Subject: [PATCH 33/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 018ad2f..b060e2d 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 9cfc1c39eb153615bb360e855c0016472a39b09d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:50:04 +0000 Subject: [PATCH 34/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 b060e2d..5063c7a 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From 12bbd4ec4513a3f231797fa96c370c6c26743921 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:21:18 +0000 Subject: [PATCH 35/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 5063c7a..cf273e2 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -4,7 +4,7 @@ Name: web-assets Version: 5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,9 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* 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 From e689bd578dfd95be6ab9f75f55a7c5987b7ac024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Tue, 22 Mar 2022 16:12:49 +0100 Subject: [PATCH 36/48] Add basic support for nginx Nginx is popular server and great for static content. Add rules for its default configuration. --- nginx-web-assets.conf | 21 +++++++++++++++++++++ web-assets.spec | 42 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 nginx-web-assets.conf diff --git a/nginx-web-assets.conf b/nginx-web-assets.conf new file mode 100644 index 0000000..6b2b0d0 --- /dev/null +++ b/nginx-web-assets.conf @@ -0,0 +1,21 @@ +# 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.spec b/web-assets.spec index cf273e2..3280029 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -1,10 +1,11 @@ #disable the httpd stuff while we're waiting on getting the path issues #cleared up %global enable_httpd 1 +%bcond_without nginx Name: web-assets Version: 5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -15,6 +16,7 @@ Source1: LICENSE Source2: macros.web-assets Source3: web-assets.conf Source4: README.devel +Source5: nginx-web-assets.conf %description %{summary}. @@ -48,6 +50,17 @@ Requires(postun): systemd %{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 %{SOURCE1} LICENSE @@ -66,6 +79,10 @@ ln -sf ../fonts %{buildroot}%{_datadir}/web-assets/fonts install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.web-assets +%if %{with nginx} +install -Dpm0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/nginx/default.d/web-assets.conf +%endif + %if 0%{?enable_httpd} install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf @@ -76,21 +93,40 @@ systemctl reload-or-try-restart httpd.service || : systemctl reload-or-try-restart httpd.service || : %endif + +%if %{with nginx} +%post nginx +[ -x %{_bindir}/systemctl ] && systemctl reload-or-try-restart nginx.service || : + +%postun nginx +[ -x %{_bindir}/systemctl ] && systemctl reload-or-try-restart nginx.service || : +%endif + %files filesystem %{_datadir}/web-assets %{_datadir}/javascript %files devel %{_rpmconfigdir}/macros.d/macros.web-assets -%doc LICENSE README.devel +%license LICENSE +%doc README.devel %if 0%{?enable_httpd} %files httpd %config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf -%doc LICENSE +%license LICENSE +%endif + +%if %{with nginx} +%files nginx +%config(noreplace) %{_sysconfdir}/nginx/default.d/web-assets.conf +%license LICENSE %endif %changelog +* 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 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 37/48] 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 38/48] 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 39/48] 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 40/48] 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 41/48] 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 a1a1e871a67069f7b5c20ee5ca835022fa99b8a9 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 24 Jun 2024 09:29:21 -0700 Subject: [PATCH 42/48] Bump release for June 2024 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..2f5b5bb 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 +* Mon Jun 24 2024 Troy Dawson - 5-22 +- Bump release for June 2024 mass rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 5-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 25af67f3cf5b808bbcbef5f45ba7cc4903cce716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 11 Jan 2022 17:12:09 +0100 Subject: [PATCH 43/48] Disable filesystem subpackage as it is already provided by CentOS 10 Stream This package supplies subpackages of CentOS 10 stream build web-assets-5-22.el10 which are not shipped in any repository. --- web-assets.spec | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web-assets.spec b/web-assets.spec index 2f5b5bb..07def55 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -18,6 +18,8 @@ BuildRequires: coreutils %description %{summary}. +%if 0 +# Disabled for EPEL 10 as already provided by CentOS 10 Stream, bug #2309358 %package filesystem Summary: The basic directory layout for Web Assets #there's nothing copyrightable about a few directories and symlinks @@ -26,6 +28,7 @@ Requires: fonts-filesystem %description filesystem %{summary}. +%endif %package devel Summary: RPM macros for Web Assets packaging @@ -66,11 +69,14 @@ cp %{SOURCE1} README.devel #nothing to do %install +%if 0 +# Disabled for EPEL 10 as already provided by CentOS 10 Stream, bug #2309358 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 +%endif install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.web-assets %if %{with httpd} install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf @@ -95,9 +101,12 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset [ -x %{_bindir}/systemctl ] && systemctl reload-or-try-restart nginx.service || : %endif +%if 0 +# Disabled for EPEL 10 as already provided by CentOS 10 Stream, bug #2309358 %files filesystem %{_datadir}/web-assets %{_datadir}/javascript +%endif %files devel %{_rpmconfigdir}/macros.d/macros.web-assets @@ -117,6 +126,10 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* Wed Sep 04 2024 Petr Pisar - 5-22 +- Disable filesystem subpackage as it is already provided by CentOS 10 Stream + (bug #2309358) + * Mon Jun 24 2024 Troy Dawson - 5-22 - Bump release for June 2024 mass rebuild From 170ca66f61afd29adecd83f2e472cbaa35309824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 11 Jan 2022 17:33:38 +0100 Subject: [PATCH 44/48] Rename spec file and source package to EPEL10-specfic web-assets-epel A spec file name must match a component name. Koji uses SRPM name for tagging: BuildError: package web-assets not in list for tag epel9-testing-candidate bug #2309358 --- ...ets.rpmlintrc => web-assets-epel.rpmlintrc | 0 web-assets.spec => web-assets-epel.spec | 34 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) rename web-assets.rpmlintrc => web-assets-epel.rpmlintrc (100%) rename web-assets.spec => web-assets-epel.spec (93%) diff --git a/web-assets.rpmlintrc b/web-assets-epel.rpmlintrc similarity index 100% rename from web-assets.rpmlintrc rename to web-assets-epel.rpmlintrc diff --git a/web-assets.spec b/web-assets-epel.spec similarity index 93% rename from web-assets.spec rename to web-assets-epel.spec index 07def55..0e46e67 100644 --- a/web-assets.spec +++ b/web-assets-epel.spec @@ -1,7 +1,7 @@ %bcond_without httpd %bcond_without nginx -Name: web-assets +Name: web-assets-epel Version: 5 Release: 22%{?dist} Summary: A simple framework for bits pushed to browsers @@ -20,43 +20,43 @@ BuildRequires: coreutils %if 0 # Disabled for EPEL 10 as already provided by CentOS 10 Stream, bug #2309358 -%package filesystem +%package -n web-assets-filesystem 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 +%description -n web-assets-filesystem %{summary}. %endif -%package devel +%package -n web-assets-devel Summary: RPM macros for Web Assets packaging License: MIT Requires: web-assets-filesystem = %{version}-%{release} -%description devel +%description -n web-assets-devel %{summary}. %if %{with httpd} -%package httpd +%package -n web-assets-httpd Summary: Web Assets aliases for the Apache HTTP daemon License: MIT Requires: web-assets-filesystem = %{version}-%{release} Requires: httpd -%description httpd +%description -n web-assets-httpd %{summary}. %endif %if %{with nginx} -%package nginx +%package -n web-assets-nginx Summary: Web Assets aliases for the nginx daemon License: MIT Requires: web-assets-filesystem = %{version}-%{release} Requires: nginx -%description nginx +%description -n web-assets-nginx %{summary}. %endif @@ -86,41 +86,41 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %if %{with httpd} -%post httpd +%post -n web-assets-httpd [ -x %{_bindir}/systemctl ] && reload-or-try-restart httpd.service || : -%postun httpd +%postun -n web-assets-httpd [ -x %{_bindir}/systemctl ] && reload-or-try-restart httpd.service || : %endif %if %{with nginx} -%post nginx +%post -n web-assets-nginx [ -x %{_bindir}/systemctl ] && systemctl reload-or-try-restart nginx.service || : -%postun nginx +%postun -n web-assets-nginx [ -x %{_bindir}/systemctl ] && systemctl reload-or-try-restart nginx.service || : %endif %if 0 # Disabled for EPEL 10 as already provided by CentOS 10 Stream, bug #2309358 -%files filesystem +%files -n web-assets-filesystem %{_datadir}/web-assets %{_datadir}/javascript %endif -%files devel +%files -n web-assets-devel %{_rpmconfigdir}/macros.d/macros.web-assets %license LICENSE %doc README.devel %if %{with httpd} -%files httpd +%files -n web-assets-httpd %config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf %license LICENSE %endif %if %{with nginx} -%files nginx +%files -n web-assets-nginx %config(noreplace) %{_sysconfdir}/nginx/default.d/web-assets.conf %license LICENSE %endif From 22e35fca57018d5d4405b9c0eff14ce7c7f654c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 4 Sep 2024 10:16:52 +0200 Subject: [PATCH 45/48] Convert license tags to SPDX PG#2 --- web-assets-epel.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web-assets-epel.spec b/web-assets-epel.spec index 0e46e67..77c5091 100644 --- a/web-assets-epel.spec +++ b/web-assets-epel.spec @@ -23,7 +23,7 @@ BuildRequires: coreutils %package -n web-assets-filesystem Summary: The basic directory layout for Web Assets #there's nothing copyrightable about a few directories and symlinks -License: Public Domain +License: LicenseRef-Fedora-Public-Domain Requires: fonts-filesystem %description -n web-assets-filesystem @@ -129,6 +129,7 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset * Wed Sep 04 2024 Petr Pisar - 5-22 - Disable filesystem subpackage as it is already provided by CentOS 10 Stream (bug #2309358) +- Convert license tags to SPDX * Mon Jun 24 2024 Troy Dawson - 5-22 - Bump release for June 2024 mass rebuild From 211d2ff3af22499165c8c8eba44b4be0e67507e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 4 Sep 2024 10:32:20 +0200 Subject: [PATCH 46/48] Fix restarting systemd services PG#2 --- web-assets-epel.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web-assets-epel.spec b/web-assets-epel.spec index 77c5091..ced058d 100644 --- a/web-assets-epel.spec +++ b/web-assets-epel.spec @@ -87,18 +87,18 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %if %{with httpd} %post -n web-assets-httpd -[ -x %{_bindir}/systemctl ] && reload-or-try-restart httpd.service || : +[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart httpd.service || : %postun -n web-assets-httpd -[ -x %{_bindir}/systemctl ] && reload-or-try-restart httpd.service || : +[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart httpd.service || : %endif %if %{with nginx} %post -n web-assets-nginx -[ -x %{_bindir}/systemctl ] && systemctl reload-or-try-restart nginx.service || : +[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart nginx.service || : %postun -n web-assets-nginx -[ -x %{_bindir}/systemctl ] && systemctl reload-or-try-restart nginx.service || : +[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart nginx.service || : %endif %if 0 @@ -130,6 +130,7 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset - Disable filesystem subpackage as it is already provided by CentOS 10 Stream (bug #2309358) - Convert license tags to SPDX +- Fix restarting systemd services * Mon Jun 24 2024 Troy Dawson - 5-22 - Bump release for June 2024 mass rebuild From b4bfb13b513051cce4c81e5a1e4baf364e3fbff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 10 Sep 2024 15:33:12 +0200 Subject: [PATCH 47/48] Fix a dependency on web-assets-filesystem EPEL10 uses a dist tag different from RHEL. --- web-assets-epel.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web-assets-epel.spec b/web-assets-epel.spec index ced058d..c581516 100644 --- a/web-assets-epel.spec +++ b/web-assets-epel.spec @@ -3,7 +3,9 @@ Name: web-assets-epel Version: 5 -Release: 22%{?dist} +%define rhel_release_number 22 +%define rhel_release %{rhel_release_number}.el10 +Release: %{rhel_release_number}%{?dist}.1 Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -33,7 +35,7 @@ Requires: fonts-filesystem %package -n web-assets-devel Summary: RPM macros for Web Assets packaging License: MIT -Requires: web-assets-filesystem = %{version}-%{release} +Requires: web-assets-filesystem = %{version}-%{rhel_release} %description -n web-assets-devel %{summary}. @@ -42,7 +44,7 @@ Requires: web-assets-filesystem = %{version}-%{release} %package -n web-assets-httpd Summary: Web Assets aliases for the Apache HTTP daemon License: MIT -Requires: web-assets-filesystem = %{version}-%{release} +Requires: web-assets-filesystem = %{version}-%{rhel_release} Requires: httpd %description -n web-assets-httpd @@ -53,7 +55,7 @@ Requires: httpd %package -n web-assets-nginx Summary: Web Assets aliases for the nginx daemon License: MIT -Requires: web-assets-filesystem = %{version}-%{release} +Requires: web-assets-filesystem = %{version}-%{rhel_release} Requires: nginx %description -n web-assets-nginx @@ -126,6 +128,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* Tue Sep 10 2024 Petr Pisar - 5-22.1 +- Fix a dependency on web-assets-filesystem (bug #2310553) + * Wed Sep 04 2024 Petr Pisar - 5-22 - Disable filesystem subpackage as it is already provided by CentOS 10 Stream (bug #2309358) From 5f290786de9e8392f43e7f87dcd4f3e47c6f7c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 28 Nov 2024 11:01:36 +0100 Subject: [PATCH 48/48] Bump release for October 2024 mass rebuild --- web-assets-epel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web-assets-epel.spec b/web-assets-epel.spec index c581516..231e660 100644 --- a/web-assets-epel.spec +++ b/web-assets-epel.spec @@ -3,9 +3,9 @@ Name: web-assets-epel Version: 5 -%define rhel_release_number 22 +%define rhel_release_number 23 %define rhel_release %{rhel_release_number}.el10 -Release: %{rhel_release_number}%{?dist}.1 +Release: %{rhel_release_number}%{?dist} Summary: A simple framework for bits pushed to browsers License: MIT URL: https://fedoraproject.org/wiki/User:Patches/PackagingDrafts/Web_Assets @@ -128,6 +128,9 @@ install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-asset %endif %changelog +* Thu Nov 28 2024 Petr Pisar - 5-23 +- Bump release for October 2024 mass rebuild + * Tue Sep 10 2024 Petr Pisar - 5-22.1 - Fix a dependency on web-assets-filesystem (bug #2310553)