- rel. 6, stb

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

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index aa9739029efc98ccbd1575211c40a864019ce038..451c6284d22485cd1e779a08ad749d6e417b4ebb 100644 (file)
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,5 +1,6 @@
 %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
@@ -19,23 +20,9 @@ Summary(sl): Vklju
 Summary(sv):   En inbyggd Python-interpretator för webbservern Apache
 Name:          apache-mod_%{mod_name}
 Version:       2.7.6
-Release:       4
+Release:       6
 License:       distributable
 Group:         Networking/Daemons
-Group(cs):     Sí»ové/Démoni
-Group(da):     Netværks/Dæmoner
-Group(de):     Netzwerkwesen/Server
-Group(es):     Red/Servidores
-Group(fr):     Réseau/Serveurs
-Group(is):     Net/Púkar
-Group(it):     Rete/Demoni
-Group(no):     Nettverks/Daemoner
-Group(pl):     Sieciowe/Serwery
-Group(pt):     Rede/Servidores
-Group(ru):     óÅÔØ/äÅÍÏÎÙ
-Group(sl):     Omre¾ni/Stre¾niki
-Group(sv):     Nätverk/Demoner
-Group(uk):     íÅÒÅÖÁ/äÅÍÏÎÉ
 Source0:       http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
 Patch0:                apache-mod_python-shared.patch
 Patch1:                apache-mod_python-DESTDIR.patch
@@ -43,15 +30,16 @@ Patch2:             apache-mod_python-Makefile-in.patch
 URL:           http://www.modpython.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: apache
 BuildRequires: apache-devel
 BuildRequires: python-devel >= 2.2
 BuildRequires: rpm-pythonprov
+BuildRequires: %{apxs}
+Prereq:                %{_sbindir}/apxs
 Requires:      apache
-%requires_eq   python
+%pyrequires_eq python
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                apache_moddir   %(/usr/sbin/apxs -q LIBEXECDIR)
+%define                apache_moddir   %(%{apxs} -q LIBEXECDIR)
 
 %description
 Mod_python is a module that embeds the Python language interpreter
@@ -150,7 +138,7 @@ autoconf
 # new apache needs it
 CFLAGS="-DEAPI %{rpmcflags}"
 %configure \
-       --with-apxs=/usr/sbin/apxs
+       --with-apxs=%{apxs}
 
 %{__make} dso
 
@@ -166,14 +154,14 @@ gzip -9nf README COPYRIGHT NEWS CREDITS
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/sbin/apxs -e -a -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
+%{_sbindir}/apxs -e -a -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       /usr/sbin/apxs -e -A -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
+       %{_sbindir}/apxs -e -A -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi