- rel 2

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

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 610535b37be24fd10695193f27e4e1cb2c42435f..bee620f14809eb129f8cdf6f75f497d3231ee4c7 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,5 +1,5 @@
 %define                mod_name        python
-%define        apxs            /usr/sbin/apxs
+%define                apxs            /usr/sbin/apxs
 Summary:       An embedded Python interpreter for the Apache Web server
 Summary(cs.UTF-8):     Vestavěný interpret Pythonu pro WWW server Apache
 Summary(da.UTF-8):     En indbygget Python-fortolker for webtjeneren Apache
@@ -18,18 +18,15 @@ 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.3.1
-Release:       9
-License:       Apache Group License
+Version:       3.4.1
+Release:       2
+License:       Apache
 Group:         Networking/Daemons/HTTP
-Source0:       http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
-# Source0-md5: a3b0150176b726bd2833dac3a7837dc5
+Source0:       http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
+# Source0-md5: d27804354f1808ad55d432fd76ed9d05
 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
 BuildRequires: apr-devel >= 1:1.0.0
 BuildRequires: autoconf
@@ -127,8 +124,6 @@ prestandan jämfört med den traditionella CGI-metoden.
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__aclocal}
@@ -139,7 +134,7 @@ prestandan jämfört med den traditionella CGI-metoden.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -160,10 +155,14 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc-html/* README COPYRIGHT NEWS CREDITS
+%doc doc-html/* README.md COPYRIGHT NEWS CREDITS
 %doc examples
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_bindir}/mod_python
 %attr(755,root,root) %{apachelibdir}/*.so
 %dir %{py_sitedir}/mod_%{mod_name}
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/mod_%{mod_name}-*.egg-info
+%endif
 %attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
 %{py_sitedir}/mod_%{mod_name}/*.py[co]