X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=bf59fa2a3cc82884d203a6268cb292b3069ec366;hp=8c7f6463bcb1ffa6466af41d5685a80d87a3a2c9;hb=f661901b021ec80a9872576f38adfa0670b78d9e;hpb=f1aed2a62ae0cc34bea86b983588052fbb3da038

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 8c7f646..bf59fa2 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,68 +1,69 @@
 %define		mod_name	python
 Summary:	A Python for the Apache Web server
+Summary(pl):	Python dla serwera WWW Apache
 Name:		apache-mod_%{mod_name}
-Version:	2.4.1
-Release:	1
+Version:	2.7.6
+Release:	4
 License:	distributable
 Group:		Networking/Daemons
+Group(de):	Netzwerkwesen/Server
 Group(pl):	Sieciowe/Serwery
-Source:	        http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
+Source0:	http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
+Patch0:		apache-mod_python-shared.patch
+Patch1:		apache-mod_python-DESTDIR.patch
 URL:		http://www.modpython.org/
-Requires:	apache
-Requires:	python 
+BuildRequires:	autoconf
 BuildRequires:	apache
 BuildRequires:	apache-devel
-BuildRequires:	python-devel
+BuildRequires:	python-devel >= 2.2
+BuildRequires:	rpm-pythonprov
+Requires:	apache
+%requires_eq	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define	apache_moddir  %(/usr/sbin/apxs -q LIBEXECDIR)
-%define python_prefix  %(echo `python -c "import sys; print sys.prefix"`)
-%define python_version %(echo `python -c "import sys; print sys.version[:3]"`)
-%define python_libdir      %{python_prefix}/lib/python%{python_version}
-%define python_includedir  %{python_prefix}/include/python%{python_version}
-%define python_sitedir     %{python_libdir}/site-packages
 
+%include /usr/lib/rpm/macros.python
 
 %description
-mod_python allows embedding Python within the Apache Web server 
-for a considerable boost in performance and added flexibility 
-in designing web based applications. 
+mod_python allows embedding Python within the Apache Web server for a
+considerable boost in performance and added flexibility in designing
+web based applications.
+
+NOTE: This versions should still be considered Beta.
+
+%description -l pl
+mod_python pozwala na zagnie¿d¿enie pythona w serwerze WWW Apache w
+celu zauwa¿alnej poprawy wydajno¶ci i zwiêkszonej elastyczno¶ci przy
+tworzeniu aplikacji opartych na WWW.
 
-NOTE: This versions should still be considered Beta
+Uwaga: ta wersja nadal powinna byæ uwa¿ana za Beta.
 
 %prep 
 %setup -q -n mod_%{mod_name}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
-python %{python_libdir}/compileall.py lib/python/mod_python/
-
-LDFLAGS=
-# RH  
-if [ -f %{python_libdir}/config/libpython%{python_version}.a ]; then 
-	LDFLAGS="$LDFLAGS -L%{python_libdir}/config/ -lpython%{python_version}"
-# PLD 
-else  
-	LDFLAGS="$LDFLAGS -lpython"
-fi  
- 
-if ldd %{python_prefix}/bin/python | grep libpthread >/dev/null; then 
-        LDFLAGS="$LDFLAGS -lpthread"
-fi 
+autoconf
 
-cd src
-/usr/sbin/apxs -I%{python_includedir} $LDFLAGS -o mod_%{mod_name}.so -c mod_%{mod_name}.c
-cd ..
-gzip -9nf README COPYRIGHT NEWS CREDITS
+# new apache needs it
+CFLAGS=-DEAPI
+%configure \
+	--with-apxs=/usr/sbin/apxs
+ 
+%{__make} dso
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{apache_moddir},%{py_sitedir}/mod_%{mod_name}}
+
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{apache_moddir}
-install src/mod_%{mod_name}.so $RPM_BUILD_ROOT%{apache_moddir}
-strip --strip-unneeded $RPM_BUILD_ROOT%{apache_moddir}/* 
+gzip -9nf README COPYRIGHT NEWS CREDITS
 
-install -d $RPM_BUILD_ROOT%{python_sitedir}/mod_%{mod_name}
-install lib/python/mod_python/* $RPM_BUILD_ROOT%{python_sitedir}/mod_%{mod_name}
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /usr/sbin/apxs -e -a -n %{mod_name} %{apache_moddir}/mod_%{mod_name}.so 1>&2
@@ -78,12 +79,9 @@ if [ "$1" = "0" ]; then
 	fi
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{apache_moddir}/*
-%{python_sitedir}/mod_%{mod_name}
-%doc doc/*
+%doc doc-html/*
 %doc {README,COPYRIGHT,NEWS,CREDITS}.gz
+%attr(755,root,root) %{apache_moddir}/*
+%{py_sitedir}/mod_%{mod_name}