diff --git a/uwsgi.changes b/uwsgi.changes index 7dccd5f..3106892 100644 --- a/uwsgi.changes +++ b/uwsgi.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 8 19:50:28 UTC 2013 - jfunk@funktronics.ca + +- Added apache2-mod_proxy_uwsgi and apache2-mod_uwsgi sub packages + ------------------------------------------------------------------- Thu Oct 17 18:10:06 UTC 2013 - jfunk@funktronics.ca diff --git a/uwsgi.spec b/uwsgi.spec index 4ac149f..37274c7 100644 --- a/uwsgi.spec +++ b/uwsgi.spec @@ -42,6 +42,14 @@ Patch2: uwsgi-1.9.13-objc_gc-no-fobjc-gc.patch Patch3: uwsgi-1.9.11-systemd_logger-old_systemd.patch # PATCH-FIX-OPENSUSE uwsgi-1.9.13-emperor_pg-Wformat.patch - gcc complains about lack of -Wformat with -Wformat-security from pg_config Patch4: uwsgi-1.9.13-emperor_pg-Wformat.patch +%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") +%if "%{apache_branch}" == "2.4" + %define apxs %{_bindir}/apxs2 +%else + %define apxs %{_sbindir}/apxs2 +%endif +%define apache_libexecdir %(%{apxs} -q LIBEXECDIR) +BuildRequires: apache2-devel %if 0%{?suse_version} > 1210 BuildRequires: erlang %endif @@ -154,6 +162,30 @@ different plugins can be used in order to add compatibility with tons of different technology on top of the same core. +%package -n apache2-mod_proxy_uwsgi +Summary: uWSGI Proxy Module for Apache 2.0 +Group: Productivity/Networking/Web/Servers +Requires: %{name} = %{version} + +%description -n apache2-mod_proxy_uwsgi +uWSGI is a fast, self-healing and developer/sysadmin-friendly application +container server coded in pure C. + +This package contains an Apache 2.0 proxy module for uWSGI. + + +%package -n apache2-mod_uwsgi +Summary: uWSGI Module for Apache 2.0 +Group: Productivity/Networking/Web/Servers +Requires: %{name} = %{version} + +%description -n apache2-mod_uwsgi +uWSGI is a fast, self-healing and developer/sysadmin-friendly application +container server coded in pure C. + +This package contains an Apache 2.0 module for uWSGI. + + %package emperor_pg Summary: PostgreSQL Emperor Plugin for uWSGI Group: Productivity/Networking/Web/Servers @@ -506,6 +538,10 @@ export CFLAGS="%{optflags} -I$(echo %{_libdir}/erlang/lib/erl_interface-*/includ %{?jobs:export CPUCOUNT=%jobs} python uwsgiconfig.py --build opensuse +# Build Apache modules +%{apxs} -c apache2/mod_proxy_uwsgi.c +%{apxs} -c apache2/mod_uwsgi.c + %install install -D -m 0755 uwsgi %{buildroot}%{_sbindir}/uwsgi install -d -m 0755 %{buildroot}%{_libdir}/uwsgi @@ -520,6 +556,8 @@ install -m 0644 vassals/multi.xml %{buildroot}%{_sysconfdir}/uwsgi/vassals/multi install -D -m 0644 uwsgidecorators.py %{buildroot}%{python_sitelib}/uwsgidecorators.py %py_compile %{buildroot}%{python_sitelib} install -D plugins/jvm/uwsgi.jar %{buildroot}%{_javadir}/uwsgi.jar +install -d -m 0755 %{buildroot}/%{apache_libexecdir} +install -m 0755 apache2/.libs/*.so %{buildroot}/%{apache_libexecdir} %pre %service_add_pre uwsgi.service @@ -614,6 +652,14 @@ install -D plugins/jvm/uwsgi.jar %{buildroot}%{_javadir}/uwsgi.jar %{_libdir}/uwsgi/xattr_plugin.so %{_libdir}/uwsgi/zergpool_plugin.so +%files -n apache2-mod_proxy_uwsgi +%defattr(-,root,root,-) +%{apache_libexecdir}/mod_proxy_uwsgi.so + +%files -n apache2-mod_uwsgi +%defattr(-,root,root,-) +%{apache_libexecdir}/mod_uwsgi.so + %files emperor_pg %defattr(-,root,root,-) %{_libdir}/uwsgi/emperor_pg_plugin.so