- release 5

[packages/apache-mod_python.git] / apache-mod_python.spec

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index fc4d8a1bfb37da64a10446c41a073dbbca0e202d..a9bfc68e106e5a961acb4264c15ae1152aac026e 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -18,15 +18,16 @@ Summary(sk.UTF-8):  Interpreter jazyka Perl pre webový server Apache
 Summary(sl.UTF-8):     Vključeni pythonski tolmač za spletni strežnik Apache
 Summary(sv.UTF-8):     En inbyggd Python-interpretator för webbservern Apache
 Name:          apache-mod_%{mod_name}
-Version:       3.2.10
-Release:       2
+Version:       3.3.1
+Release:       5
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
-# Source0-md5: cc6439f546a6e70cfff7ca51b8c62541
+# Source0-md5: a3b0150176b726bd2833dac3a7837dc5
 Source1:       %{name}.conf
 Patch0:                %{name}-httpd-not-needed.patch
 Patch1:                %{name}-ldflags.patch
+Patch2:                %{name}-apr_brigade_sentinel.patch
 URL:           http://www.modpython.org/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.52-7
@@ -45,8 +46,8 @@ Requires:     python-devel-tools
 %requires_eq   python-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define                apachelibdir    %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                apacheconfdir   %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 Mod_python is a module that embeds the Python language interpreter
@@ -127,6 +128,7 @@ prestandan jämfört med den traditionella CGI-metoden.
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -137,12 +139,12 @@ prestandan jämfört med den traditionella CGI-metoden.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/60_mod_python.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/60_mod_python.conf
 %py_postclean
 
 %clean
@@ -160,8 +162,8 @@ fi
 %defattr(644,root,root,755)
 %doc doc-html/* README COPYRIGHT NEWS CREDITS
 %doc examples
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{apachelibdir}/*.so
 %dir %{py_sitedir}/mod_%{mod_name}
 %attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
 %{py_sitedir}/mod_%{mod_name}/*.py[co]