Hello community, here is the log from the commit of package apache2-mod_wsgi for openSUSE:Factory checked in at 2014-05-02 13:54:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_wsgi (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_wsgi" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_wsgi/apache2-mod_wsgi.changes 2014-01-27 15:15:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new/apache2-mod_wsgi.changes 2014-05-02 13:54:09.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 28 20:16:57 UTC 2014 - [email protected] + +- Fix module name sent to a2enmod/a2dismod and fix/cleanup + post/postun scripts. + +------------------------------------------------------------------- @@ -27,0 +34,11 @@ + +------------------------------------------------------------------- +Fri Dec 16 12:59:15 UTC 2011 - [email protected] + +- add post/postun section + * enable module after install (a2enmod) + * disable module after deinstall (a2enmod -d) +- fix License as required by http://spdx.org/licenses/ + * Apache-2.0 +- fix build for CentOS/RHEL +- spec-cleanup ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_wsgi.spec ++++++ --- /var/tmp/diff_new_pack.LRGstq/_old 2014-05-02 13:54:09.000000000 +0200 +++ /var/tmp/diff_new_pack.LRGstq/_new 2014-05-02 13:54:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_wsgi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,50 +16,103 @@ # +%define modname mod_wsgi +%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") + +%if "%{apache_branch}" == "2.4" + %define bindir %{_bindir} +%else + %define bindir %{_sbindir} +%endif + +%if 0%{?suse_version} +%define apxs %{bindir}/apxs2 +%else +%define apxs %{bindir}/apxs +%endif + +%define apache apache2 +%define apache_serverroot %(%{apxs} -q PREFIX) +%define apache_includedir %(%{apxs} -q INCLUDEDIR) +%define apache_libexecdir %(%{apxs} -q LIBEXECDIR) + +%if 0%{?suse_version} +%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) +%else +%define apache_sysconfdir %(%{apxs} -q PREFIX) +%endif + +%define apache_localstatedir %(%{apxs} -q LOCALSTATEDIR) +%define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) + Name: apache2-mod_wsgi -Version: 3.4 -Release: 0 Summary: Python WSGI adapter module for Apache License: Apache-2.0 Group: Productivity/Networking/Web/Servers +Version: 3.4 +Release: 0 Url: http://code.google.com/p/modwsgi/ -Source: http://modwsgi.googlecode.com/files/mod_wsgi-%{version}.tar.gz +Source: http://modwsgi.googlecode.com/files/%{modname}-%{version}.tar.gz Patch01: mod_wsgi-3.4-connsbh.patch -%define tarname mod_wsgi -%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") -%if "%{apache_branch}" == "2.4" - %define apxs %{_bindir}/apxs2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%if 0%{?suse_version} +BuildRequires: apache2-devel %else - %define apxs %{_sbindir}/apxs2 +BuildRequires: httpd +BuildRequires: httpd-devel %endif -%define apache_libexecdir %(%{apxs} -q LIBEXECDIR) -BuildRequires: apache2-devel BuildRequires: python-devel + +%if 0%{?suse_version} Requires: apache2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%else +Requires: httpd +%endif %description The aim of mod_wsgi is to implement a simple to use Apache module which can host any Python application which supports the Python WSGI interface. %prep -%setup -n %{tarname}-%{version} +%setup -n %{modname}-%{version} %patch01 -p1 %build +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure \ +%if 0%{?suse_version} --with-apxs="%{apxs}-prefork" \ +%else + --with-apxs="%{apxs}" \ +%endif --with-python="python" make %{?_smp_mflags} %install mkdir -p %{buildroot}/%{apache_libexecdir} -cp -p .libs/mod_wsgi.so %{buildroot}/%{apache_libexecdir} +cp -p .libs/%{modname}.so %{buildroot}/%{apache_libexecdir} + +%post +%if 0%{?suse_version} +if ! %{_sbindir}/a2enmod -q wsgi; then + %{_sbindir}/a2enmod wsgi +fi +%endif + +%postun +%if 0%{?suse_version} +if [ "$1" = "0" ]; then + if a2enmod -q wsgi; then + %{_sbindir}/a2enmod -d wsgi + fi +fi +%endif %files %defattr(-,root,root) %doc LICENCE README %dir %{apache_libexecdir} -%{apache_libexecdir}/mod_wsgi.so +%{apache_libexecdir}/%{modname}.so %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
