- simplified and fixed installation procedure (now it works)

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

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 65cc697dcc6ea06bb5ae4b09f2f4def3a73a31aa..c7f2b92faac0228cf47b346d363c1d0aec0373ff 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -2,6 +2,7 @@
 %include       /usr/lib/rpm/macros.python
 %define                mod_name        python
 %define        apxs            /usr/sbin/apxs
+
 Summary:       An embedded Python interpreter for the Apache Web server
 Summary(cs):   Vestavìný interpret Pythonu pro WWW server Apache
 Summary(da):   En indbygget Python-fortolker for webtjeneren Apache
@@ -12,7 +13,7 @@ Summary(id):  Interpreter Perl untuk web server Apache
 Summary(is):   Perl túlkur fyrir Apache vefþjóninn
 Summary(it):   Interprete Python integrato per il server Web Apache
 Summary(ja):   Apache Web ¥µ¡¼¥Ð¡¼ÍѤÎÁȹþ¤ß Perl ¥¤¥ó¥¿¡¼¥×¥ê¥¿
-Summary(no):   En Python-fortolker for webtjeneren Apache
+Summary(nb):   En Python-fortolker for webtjeneren Apache
 Summary(pl):   Wbudowany interpreter jêzyka Python dla serwera WWW Apache
 Summary(pt):   Um interpretador de Perl embebido para o servidor Web Apache
 Summary(ru):   ÷ÓÔÒÏÅÎÎÙÊ ÉÎÔÅÒÐÒÅÔÁÔÏÒ Perl ÄÌÑ WWW-ÓÅÒ×ÅÒÁ Apache
@@ -20,23 +21,24 @@ Summary(sk):        Interpreter jazyka Perl pre webov
 Summary(sl):   Vkljuèeni pythonski tolmaè za spletni stre¾nik Apache
 Summary(sv):   En inbyggd Python-interpretator för webbservern Apache
 Name:          apache-mod_%{mod_name}
-Version:       3.0.3
-Release:       1
+Version:       3.1.3
+Release:       2
 License:       Apache Group License
 Group:         Networking/Daemons
-Source0:       http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
-# Source0-md5: 39f8db0bafac6ce241599d2299b5d853
+Source0:       http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
+# Source0-md5: 2e1983e35edd428f308b0dfeb1c23bfe
 Source1:       %{name}.conf
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-no-compile.patch
+Patch0:                %{name}-lib64.patch
 URL:           http://www.modpython.org/
+BuildRequires: %{apxs}
+BuildRequires: apache-devel >= 2.0.44
+BuildRequires: apr-devel >= 1:0.9.4-1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: apache-devel >= 2.0.44
+BuildRequires: flex >= 2.5.31
 BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-pythonprov
-BuildRequires: %{apxs}
-Prereq:                %{_sbindir}/apxs
+Requires(post,preun):  %{apxs}
 Requires:      apache >= 2.0.44
 %pyrequires_eq python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -120,8 +122,9 @@ prestandan j
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%if "%{_libdir}" == "%{_prefix}/lib64"
+%patch0
+%endif
 
 %build
 %{__aclocal}
@@ -136,17 +139,14 @@ CFLAGS="-DEAPI %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{apache_moddir},%{py_sitedir}/mod_%{mod_name}} \
+install -d $RPM_BUILD_ROOT%{apache_moddir} \
        $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__make} install_py_lib DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
 
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -164,9 +164,9 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc-html/*
-%doc README COPYRIGHT NEWS CREDITS
+%doc doc-html/* README COPYRIGHT NEWS CREDITS
 %{_sysconfdir}/httpd/httpd.conf/60_mod_python.conf
 %attr(755,root,root) %{apache_moddir}/*
 %dir %{py_sitedir}/mod_%{mod_name}
+%attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
 %{py_sitedir}/mod_%{mod_name}/*.py[co]