From 1fa6e47c6afe77be9142482b640c8010c116d35f Mon Sep 17 00:00:00 2001 From: Release Configuration Management Date: Fri, 9 Oct 2020 05:19:11 +0000 Subject: [PATCH 1/8] New branch setup --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 From 702750fce0daef12ca162ed23d24989edc89d455 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 15 Oct 2020 13:40:40 -0700 Subject: [PATCH 2/8] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/web-assets#7f330215846fd1c161cacb3598675eba4aed34cf --- LICENSE | 19 ++++++ README.devel | 8 +++ README.md | 19 ++++++ macros.web-assets | 13 ++++ sources | 0 web-assets.conf | 43 +++++++++++++ web-assets.spec | 153 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 255 insertions(+) create mode 100644 LICENSE create mode 100644 README.devel create mode 100644 README.md create mode 100644 macros.web-assets create mode 100644 sources create mode 100644 web-assets.conf create mode 100644 web-assets.spec diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..17597ed --- /dev/null +++ b/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/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/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/) diff --git a/macros.web-assets b/macros.web-assets new file mode 100644 index 0000000..48ca9f9 --- /dev/null +++ b/macros.web-assets @@ -0,0 +1,13 @@ +%_webassetdir %{_datadir}/web-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.conf b/web-assets.conf new file mode 100644 index 0000000..94784a7 --- /dev/null +++ b/web-assets.conf @@ -0,0 +1,43 @@ + + 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/web-assets.spec b/web-assets.spec new file mode 100644 index 0000000..018ad2f --- /dev/null +++ b/web-assets.spec @@ -0,0 +1,153 @@ +#disable the httpd stuff while we're waiting on getting the path issues +#cleared up +%global enable_httpd 1 + +Name: web-assets +Version: 5 +Release: 12%{?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 +Source2: macros.web-assets +Source3: web-assets.conf +Source4: README.devel + +%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 = %{version}-%{release} + +%description devel +%{summary}. + +%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 + +%prep +%setup -c -T +cp %{SOURCE1} LICENSE +cp %{SOURCE4} README.devel + +%build +#nothing to do + +%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 0%{?enable_httpd} +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 || : +%endif + +%files filesystem +%{_datadir}/web-assets +%{_datadir}/javascript + +%files devel +%{_rpmconfigdir}/macros.d/macros.web-assets +%doc LICENSE README.devel + +%if 0%{?enable_httpd} +%files httpd +%config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf +%doc LICENSE +%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 + +* 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 + +* 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 + directory + +* 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) +- 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 85f0467f54597927d58c060141f65a22d75f4371 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 5 Feb 2021 07:57:00 +0100 Subject: [PATCH 3/8] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/web-assets.git#f70ffdfce1f26e3686d5ad84f6b07edaaa3c9c4b --- 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 786ddbf128b96bc340459b93eaec33b04651db4d Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 16 Apr 2021 06:10:09 +0000 Subject: [PATCH 4/8] - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 Signed-off-by: Mohan Boddu --- web-assets.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index b060e2d..ef3f24d 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 Apr 16 2021 Mohan Boddu - 5-14 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + * Wed Jan 27 2021 Fedora Release Engineering - 5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From aa2f00bf44aa35033d3519554af646542da377a5 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 10 Aug 2021 01:19:21 +0000 Subject: [PATCH 5/8] Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 Signed-off-by: Mohan Boddu --- web-assets.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web-assets.spec b/web-assets.spec index ef3f24d..153f704 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,10 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* Tue Aug 10 2021 Mohan Boddu - 5-15 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + * Fri Apr 16 2021 Mohan Boddu - 5-14 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 From b093c7fd596f25bb5dbbb02666ec192c18f8d176 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 6/8] Disable filesystem subpackage as it is already provided by CentOS 9 Stream This package supplies subpackages of CentOS 9 stream build web-assets-5-15.el9 which are not shipped in any repository. --- web-assets.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web-assets.spec b/web-assets.spec index 153f704..8664739 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -57,12 +57,15 @@ cp %{SOURCE4} README.devel #nothing to do %install +%if 0 +# Disabled for EPEL 9 as already provided by CentOS 9 Stream, bug #2036086 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 @@ -76,9 +79,12 @@ systemctl reload-or-try-restart httpd.service || : systemctl reload-or-try-restart httpd.service || : %endif +%if 0 +# Disabled for EPEL 9 as already provided by CentOS 9 Stream, bug #2036086 %files filesystem %{_datadir}/web-assets %{_datadir}/javascript +%endif %files devel %{_rpmconfigdir}/macros.d/macros.web-assets @@ -91,6 +97,10 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* Tue Jan 11 2022 Petr Pisar - 5-15 +- Disable filesystem subpackage as it is already provided by CentOS 9 Stream + (bug #2036086) + * Tue Aug 10 2021 Mohan Boddu - 5-15 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 From 4618392f240f0efd587c00700d1e0b1fced04f17 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 7/8] Rename spec file to EPEL9-specfic web-assets-epel A spec file name must match a component name. bug #2036086 --- web-assets.spec => web-assets-epel.spec | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename web-assets.spec => web-assets-epel.spec (100%) diff --git a/web-assets.spec b/web-assets-epel.spec similarity index 100% rename from web-assets.spec rename to web-assets-epel.spec From ed56c4869c2f17e85ce6d4e0a5a552d61e95e0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 11 Jan 2022 17:44:33 +0100 Subject: [PATCH 8/8] Rename source package to web-assets-epel Koji uses SRPM name for tagging: BuildError: package web-assets not in list for tag epel9-testing-candidate bug #2036086 --- web-assets-epel.spec | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/web-assets-epel.spec b/web-assets-epel.spec index 8664739..b50c0b9 100644 --- a/web-assets-epel.spec +++ b/web-assets-epel.spec @@ -2,7 +2,7 @@ #cleared up %global enable_httpd 1 -Name: web-assets +Name: web-assets-epel Version: 5 Release: 15%{?dist} Summary: A simple framework for bits pushed to browsers @@ -19,24 +19,27 @@ Source4: README.devel %description %{summary}. -%package filesystem +%if 0 +# Disabled for EPEL 9 as already provided by CentOS 9 Stream, bug #2036086 +%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 -%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 0%{?enable_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} @@ -44,7 +47,7 @@ Requires: httpd Requires(post): systemd Requires(postun): systemd -%description httpd +%description -n web-assets-httpd %{summary}. %endif @@ -72,26 +75,26 @@ install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.web-ass %if 0%{?enable_httpd} install -Dpm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/web-assets.conf -%post httpd +%post -n web-assets-httpd systemctl reload-or-try-restart httpd.service || : -%postun httpd +%postun -n web-assets-httpd systemctl reload-or-try-restart httpd.service || : %endif %if 0 # Disabled for EPEL 9 as already provided by CentOS 9 Stream, bug #2036086 -%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 %doc LICENSE README.devel %if 0%{?enable_httpd} -%files httpd +%files -n web-assets-httpd %config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf %doc LICENSE %endif