Compare commits

...
Sign in to create a new pull request.

50 commits

Author SHA1 Message Date
Petr Písař
5f290786de Bump release for October 2024 mass rebuild 2024-11-28 11:01:36 +01:00
Petr Písař
b4bfb13b51 Fix a dependency on web-assets-filesystem
EPEL10 uses a dist tag different from RHEL.
2024-09-10 15:33:53 +02:00
Petr Písař
211d2ff3af Fix restarting systemd services
PG#2
2024-09-04 10:55:46 +02:00
Petr Písař
22e35fca57 Convert license tags to SPDX
PG#2
2024-09-04 10:55:34 +02:00
Petr Písař
170ca66f61 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
2024-09-04 10:23:59 +02:00
Petr Písař
25af67f3cf 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.
2024-09-04 10:14:15 +02:00
Petr Písař
5a55a51d93 Merge remote-tracking branch 'centos/c10s' into epel10
Merged from CentOS Stream c10s branch as referred in
web-assets-5-22.el10 CentOS Stream 10 build.
2024-09-04 09:33:37 +02:00
Troy Dawson
a1a1e871a6 Bump release for June 2024 mass rebuild 2024-06-24 09:29:21 -07:00
Fedora Release Engineering
efb6c383c4 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 08:32:05 +00:00
Fedora Release Engineering
546069c52f Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:04:19 +00:00
Fedora Release Engineering
d834af2ce2 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 06:41:48 +00:00
Fedora Release Engineering
9180d19774 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:17:46 +00:00
Petr Písař
aa922d14c6 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.
2022-03-23 10:38:58 +01:00
Petr Menšík
e689bd578d Add basic support for nginx
Nginx is popular server and great for static content. Add rules for its
default configuration.
2022-03-22 16:18:19 +01:00
Fedora Release Engineering
12bbd4ec45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 04:21:18 +00:00
Fedora Release Engineering
9cfc1c39eb - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 20:50:04 +00:00
Fedora Release Engineering
f70ffdfce1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 23:23:37 +00:00
Fedora Release Engineering
7f33021584 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 14:02:13 +00:00
Fedora Release Engineering
17e211aed4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 03:34:04 +00:00
Fedora Release Engineering
6b83860589 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 03:20:43 +00:00
Fedora Release Engineering
3c12a57063 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 11:35:45 +00:00
Fedora Release Engineering
7a98752c44 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 08:45:34 +00:00
Fedora Release Engineering
116c211af0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 20:48:54 +00:00
Fedora Release Engineering
4cfe7e992a - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 21:32:02 +00:00
Fedora Release Engineering
332f9f7653 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 17:17:31 +00:00
Fedora Release Engineering
645b542ce9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 02:56:10 +00:00
Dennis Gilmore
5c041effe5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-19 02:18:16 +00:00
Dennis Gilmore
8b854acfe7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 23:18:27 -05:00
T.C. Hollingsworth
6a358b51dd web-assets-5-1 2014-03-19 02:45:05 -07:00
T.C. Hollingsworth
d1f169aa54 re-enable httpd subpackage 2014-03-19 02:45:05 -07:00
T.C. Hollingsworth
4ab8661d39 enable symlinks in %{_webassetdir} and %{_jsdir} 2014-03-19 02:45:00 -07:00
T.C. Hollingsworth
1c1b6bc7ba enable webfonts 2014-03-19 02:33:10 -07:00
T.C. Hollingsworth
25205cfbf7 order Aliases for compatibility with older Apache releases
thanks to Remi Collet
2014-03-19 02:26:46 -07:00
T.C. Hollingsworth
fb7f749d14 switch to dot-prefixed Aliases 2014-03-19 02:26:06 -07:00
T.C. Hollingsworth
b1dd16e6e2 add Apache 2.2 support to httpd config
thanks to Remi Collet
2013-08-27 16:49:41 -07:00
T.C. Hollingsworth
b4a131eb9a merge history from draft packaging 2013-08-27 05:17:41 -07:00
Fedora Release Engineering
b0d254d469 Initial setup of the repo 2013-08-26 12:23:26 +00:00
T.C. Hollingsworth
62e5d15bcd add brief README to devel 2013-08-24 11:34:51 -07:00
T.C. Hollingsworth
54bd96066f tighten dependency on filesystem from other packages 2013-08-24 11:33:14 -07:00
T.C. Hollingsworth
21254af28f temporarily disable httpd stuff while we're waiting on sorting out the
directory
2013-08-15 18:48:14 -07:00
T.C. Hollingsworth
51f669ec18 web-assets-3 2013-07-30 09:12:34 -07:00
T.C. Hollingsworth
dcb45c11a1 provide a /_sysassets/js shortcut 2013-07-30 09:09:13 -07:00
T.C. Hollingsworth
fecd0ba93c rename directories per discussion on lists 2013-07-30 09:07:24 -07:00
T.C. Hollingsworth
5f83604753 add some instructions 2013-07-19 04:49:36 -07:00
T.C. Hollingsworth
45164ba7ae web-assets-2 2013-07-19 04:36:54 -07:00
T.C. Hollingsworth
74a19dd4c1 alias %{_jsdir} explicitly
fonts will come next, but they're going to need more magic
2013-07-19 04:34:09 -07:00
T.C. Hollingsworth
08a84bd9f3 add "Require all granted" as suggested by Remi Collet 2013-07-19 04:33:27 -07:00
T.C. Hollingsworth
6cb795fad5 prefix httpd-exported directory with an underscore
as suggest by Joe Orton on <lists@fpo>
2013-07-19 04:30:03 -07:00
T.C. Hollingsworth
54b5384e31 rename the license now that we have proper git 2013-07-19 04:29:31 -07:00
T.C. Hollingsworth
77c6df909d a star is born 2013-07-19 04:26:37 -07:00
10 changed files with 359 additions and 2 deletions

0
.gitignore vendored Normal file
View file

19
LICENSE Normal file
View file

@ -0,0 +1,19 @@
Copyright 2013 T.C. Hollingsworth <tchollingsworth@gmail.com>
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.

8
README.devel Normal file
View file

@ -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

View file

@ -1,3 +1,19 @@
# web-assets-epel
one directory to rule them all
==============================
A simple framework for bits pushed to browsers
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/)

43
httpd-web-assets.conf Normal file
View file

@ -0,0 +1,43 @@
<Directory /usr/share/web-assets>
Options -Indexes +FollowSymLinks
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order deny,allow
Allow from all
</IfModule>
</Directory>
<Directory /usr/share/javascript>
Options -Indexes +FollowSymLinks
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order deny,allow
Allow from all
</IfModule>
</Directory>
<Directory /usr/share/fonts>
Options -Indexes
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order deny,allow
Allow from all
</IfModule>
</Directory>
Alias /.sysassets/fonts /usr/share/fonts
Alias /.sysassets/javascript /usr/share/javascript
Alias /.sysassets/js /usr/share/javascript
Alias /.sysassets /usr/share/web-assets

13
macros.web-assets Normal file
View file

@ -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
)
}

21
nginx-web-assets.conf Normal file
View file

@ -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;
}

0
sources Normal file
View file

View file

@ -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')

232
web-assets-epel.spec Normal file
View file

@ -0,0 +1,232 @@
%bcond_without httpd
%bcond_without nginx
Name: web-assets-epel
Version: 5
%define rhel_release_number 23
%define rhel_release %{rhel_release_number}.el10
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
Source0: LICENSE
Source1: README.devel
Source2: macros.web-assets
Source3: httpd-web-assets.conf
Source4: nginx-web-assets.conf
BuildArch: noarch
BuildRequires: coreutils
%description
%{summary}.
%if 0
# Disabled for EPEL 10 as already provided by CentOS 10 Stream, bug #2309358
%package -n web-assets-filesystem
Summary: The basic directory layout for Web Assets
#there's nothing copyrightable about a few directories and symlinks
License: LicenseRef-Fedora-Public-Domain
Requires: fonts-filesystem
%description -n web-assets-filesystem
%{summary}.
%endif
%package -n web-assets-devel
Summary: RPM macros for Web Assets packaging
License: MIT
Requires: web-assets-filesystem = %{version}-%{rhel_release}
%description -n web-assets-devel
%{summary}.
%if %{with httpd}
%package -n web-assets-httpd
Summary: Web Assets aliases for the Apache HTTP daemon
License: MIT
Requires: web-assets-filesystem = %{version}-%{rhel_release}
Requires: httpd
%description -n web-assets-httpd
%{summary}.
%endif
%if %{with nginx}
%package -n web-assets-nginx
Summary: Web Assets aliases for the nginx daemon
License: MIT
Requires: web-assets-filesystem = %{version}-%{rhel_release}
Requires: nginx
%description -n web-assets-nginx
%{summary}.
%endif
%prep
%setup -c -T
cp %{SOURCE0} LICENSE
cp %{SOURCE1} README.devel
%build
#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
%endif
%if %{with nginx}
install -Dpm0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nginx/default.d/web-assets.conf
%endif
%if %{with httpd}
%post -n web-assets-httpd
[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart httpd.service || :
%postun -n web-assets-httpd
[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart httpd.service || :
%endif
%if %{with nginx}
%post -n web-assets-nginx
[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart nginx.service || :
%postun -n web-assets-nginx
[ -x %{_bindir}/systemctl ] && systemctl try-reload-or-restart nginx.service || :
%endif
%if 0
# Disabled for EPEL 10 as already provided by CentOS 10 Stream, bug #2309358
%files -n web-assets-filesystem
%{_datadir}/web-assets
%{_datadir}/javascript
%endif
%files -n web-assets-devel
%{_rpmconfigdir}/macros.d/macros.web-assets
%license LICENSE
%doc README.devel
%if %{with httpd}
%files -n web-assets-httpd
%config(noreplace) %{_sysconfdir}/httpd/conf.d/web-assets.conf
%license LICENSE
%endif
%if %{with nginx}
%files -n web-assets-nginx
%config(noreplace) %{_sysconfdir}/nginx/default.d/web-assets.conf
%license LICENSE
%endif
%changelog
* Thu Nov 28 2024 Petr Pisar <ppisar@redhat.com> - 5-23
- Bump release for October 2024 mass rebuild
* Tue Sep 10 2024 Petr Pisar <ppisar@redhat.com> - 5-22.1
- Fix a dependency on web-assets-filesystem (bug #2310553)
* Wed Sep 04 2024 Petr Pisar <ppisar@redhat.com> - 5-22
- 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 <tdawson@redhat.com> - 5-22
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Mar 23 2022 Petr Pisar <ppisar@redhat.com> - 5-17
- Make a dependency on systemd optional for restarting httpd
* Tue Mar 22 2022 Petr Menšík <pemensik@redhat.com> - 5-16
- Add nginx aliases support
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Mar 19 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 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 <tchollingsworth@gmail.com> - 4-2
- tighten dependency on filesystem from other packages
- add brief README to -devel
* Fri Aug 16 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 4-1
- temporarily disable httpd stuff while we're waiting on sorting out the
directory
* Tue Jul 30 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 3-1
- rename directories per discussion on lists
- provide a /_sysassets/js shortcut
* Fri Jul 19 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 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 <tchollingsworth@gmail.com> - 1-1
- initial package