Compare commits
50 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f290786de | ||
|
|
b4bfb13b51 | ||
|
|
211d2ff3af | ||
|
|
22e35fca57 | ||
|
|
170ca66f61 | ||
|
|
25af67f3cf | ||
|
|
5a55a51d93 | ||
|
|
a1a1e871a6 | ||
|
|
efb6c383c4 | ||
|
|
546069c52f | ||
|
|
d834af2ce2 | ||
|
|
9180d19774 | ||
|
|
aa922d14c6 | ||
|
|
e689bd578d | ||
|
|
12bbd4ec45 | ||
|
|
9cfc1c39eb | ||
|
|
f70ffdfce1 | ||
|
|
7f33021584 | ||
|
|
17e211aed4 | ||
|
|
6b83860589 | ||
|
|
3c12a57063 | ||
|
|
7a98752c44 | ||
|
|
116c211af0 | ||
|
|
4cfe7e992a | ||
|
|
332f9f7653 | ||
|
|
645b542ce9 | ||
|
|
5c041effe5 | ||
|
|
8b854acfe7 | ||
|
|
6a358b51dd | ||
|
|
d1f169aa54 | ||
|
|
4ab8661d39 | ||
|
|
1c1b6bc7ba | ||
|
|
25205cfbf7 | ||
|
|
fb7f749d14 | ||
|
|
b1dd16e6e2 | ||
|
|
b4a131eb9a | ||
|
|
b0d254d469 | ||
|
|
62e5d15bcd | ||
|
|
54bd96066f | ||
|
|
21254af28f | ||
|
|
51f669ec18 | ||
|
|
dcb45c11a1 | ||
|
|
fecd0ba93c | ||
|
|
5f83604753 | ||
|
|
45164ba7ae | ||
|
|
74a19dd4c1 | ||
|
|
08a84bd9f3 | ||
|
|
6cb795fad5 | ||
|
|
54b5384e31 | ||
|
|
77c6df909d |
10 changed files with 359 additions and 2 deletions
0
.gitignore
vendored
Normal file
0
.gitignore
vendored
Normal file
19
LICENSE
Normal file
19
LICENSE
Normal 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
8
README.devel
Normal 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
|
||||
20
README.md
20
README.md
|
|
@ -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
43
httpd-web-assets.conf
Normal 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
13
macros.web-assets
Normal 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
21
nginx-web-assets.conf
Normal 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
0
sources
Normal file
5
web-assets-epel.rpmlintrc
Normal file
5
web-assets-epel.rpmlintrc
Normal 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
232
web-assets-epel.spec
Normal 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
|
||||
Loading…
Add table
Add a link
Reference in a new issue