Accepting request 833568 from home:gladiac:apps

- Add systemd tmpfile.d config to create /run/uwsgi
- Use %license for the LICENSE

OBS-URL: https://build.opensuse.org/request/show/833568
OBS-URL: https://build.opensuse.org/package/show/server:http/uwsgi?expand=0&rev=94
This commit is contained in:
James Oakley 2020-09-17 21:55:48 +00:00 committed by Git OBS Bridge
parent 7fa703eb79
commit 9bf3b4fa80
3 changed files with 22 additions and 2 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Sep 9 10:29:20 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
- Add systemd tmpfile.d config to create /run/uwsgi
-------------------------------------------------------------------
Wed Sep 9 09:42:14 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
- Use %license for the LICENSE
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 8 18:09:43 UTC 2020 - James Oakley <jfunk@funktronics.ca> Mon Jun 8 18:09:43 UTC 2020 - James Oakley <jfunk@funktronics.ca>

View File

@ -32,6 +32,7 @@ Source5: trac.ini.example
Source6: werkzeug.xml.example Source6: werkzeug.xml.example
Source7: README.openSUSE Source7: README.openSUSE
Source8: uwsgi.ini Source8: uwsgi.ini
Source9: uwsgi.tmpfiles.d
# PATCH-FIX-OPENSUSE uwsgi-1.9.17-plugin_build_path.patch - Don't attempt to install plugins to target dest during build # PATCH-FIX-OPENSUSE uwsgi-1.9.17-plugin_build_path.patch - Don't attempt to install plugins to target dest during build
Patch0: uwsgi-1.9.17-plugin_build_path.patch Patch0: uwsgi-1.9.17-plugin_build_path.patch
# PATCH-FIX-OPENSUSE uwsgi-1.9.17-no-LD_RUN_PATH.patch - Disable invalid rpath in plugins # PATCH-FIX-OPENSUSE uwsgi-1.9.17-no-LD_RUN_PATH.patch - Disable invalid rpath in plugins
@ -164,6 +165,7 @@ Different plugins can be used in order to add compatibility with
different technology on top of the same core. different technology on top of the same core.
# This is part of the apache2 package now
%if 0%{suse_version} < 1500 %if 0%{suse_version} < 1500
%package -n apache2-mod_proxy_uwsgi %package -n apache2-mod_proxy_uwsgi
Summary: uWSGI Proxy Module for Apache 2.0 Summary: uWSGI Proxy Module for Apache 2.0
@ -570,11 +572,15 @@ install -m 0755 apache2/.libs/*.so %{buildroot}/%{apache_libexecdir}
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcuwsgi ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcuwsgi
%endif %endif
install -d -m 0755 %{buildroot}%{_tmpfilesdir}
install -m 0644 %{SOURCE9} %{buildroot}/%{_tmpfilesdir}/uwsgi.conf
%pre %pre
%service_add_pre uwsgi.service %service_add_pre uwsgi.service
%post %post
%service_add_post uwsgi.service %service_add_post uwsgi.service
%tmpfiles_create %{_tmpfilesdir}/uwsgi.conf
%preun %preun
%service_del_preun uwsgi.service %service_del_preun uwsgi.service
@ -584,15 +590,17 @@ ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcuwsgi
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc CONTRIBUTORS LICENSE README contrib examples README.openSUSE %license LICENSE
%doc CONTRIBUTORS README contrib examples README.openSUSE
%{_sbindir}/uwsgi %{_sbindir}/uwsgi
%dir %{_sysconfdir}/uwsgi/ %dir %{_sysconfdir}/uwsgi/
%config(noreplace) %{_sysconfdir}/uwsgi/uwsgi.ini %config(noreplace) %{_sysconfdir}/uwsgi/uwsgi.ini
%dir %{_sysconfdir}/uwsgi/vassals %dir %{_sysconfdir}/uwsgi/vassals
%config %{_sysconfdir}/uwsgi/vassals/* %config %{_sysconfdir}/uwsgi/vassals/*
%dir %{_libdir}/uwsgi %dir %{_libdir}/uwsgi
%ghost /run/uwsgi %ghost %dir %attr(711,root,root) /run/uwsgi
%{_unitdir}/uwsgi.service %{_unitdir}/uwsgi.service
%{_tmpfilesdir}/uwsgi.conf
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
%{_sbindir}/rcuwsgi %{_sbindir}/rcuwsgi
%endif %endif

2
uwsgi.tmpfiles.d Normal file
View File

@ -0,0 +1,2 @@
# Type Path Mode UID GID Age Argument
d /run/uwsgi 0711 root root - -