X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=a49ee1f7e74ccd2f3c224fa4aa1cccd548311f0d;hp=0cc45aac2caa12d01a29ffd7c6c732a39c970cb8;hb=b191a78cfc3640cf3409478d200c3f3577743154;hpb=4052a74d9c0623c8a7267ec720d6834bf25e0206

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 0cc45aa..a49ee1f 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,3 +1,9 @@
+
+#
+# todo:
+# - configuration file in /etc/httpd/httpd.conf/ _directory_
+#
+
 %include	/usr/lib/rpm/macros.python
 %define		mod_name	python
 %define 	apxs		/usr/sbin/apxs
@@ -19,24 +25,18 @@ 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:	2.7.8
-Release:	5
-License:	distributable
+Version:	3.0.1
+Release:	0.2
+License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
-#Patch0:		%{name}-shared.patch
-Patch1:		%{name}-DESTDIR.patch
-Patch2:		%{name}-Makefile-in.patch
-Patch3:		%{name}-cleanup.patch
-# PLD keeps static libs in /usr/lib default python install stores them in .../config/
-Patch4: 	%{name}-static-lib-dir-fix.patch
-
+Patch0:		%{name}-DESTDIR.patch
+Patch1:		%{name}-no-compile.patch
 URL:		http://www.modpython.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	apache-devel
+BuildRequires:	apache-devel >= 2.0.44
 BuildRequires:	python-devel >= 2.2
-BuildRequires:  python-static >= 2.2
 BuildRequires:	rpm-pythonprov
 BuildRequires:	%{apxs}
 Prereq:		%{_sbindir}/apxs
@@ -123,13 +123,8 @@ prestandan j
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
-# Patch reverted. Dynamic build makes apache segfault on all my i686 machines
-# No working reports collected on IRC/mailing lists.
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__aclocal}
@@ -148,18 +143,19 @@ install -d $RPM_BUILD_ROOT{%{apache_moddir},%{py_sitedir}/mod_%{mod_name}}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{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
-	%{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
@@ -170,4 +166,5 @@ fi
 %doc doc-html/*
 %doc README COPYRIGHT NEWS CREDITS
 %attr(755,root,root) %{apache_moddir}/*
-%{py_sitedir}/mod_%{mod_name}
+%dir %{py_sitedir}/mod_%{mod_name}
+%{py_sitedir}/mod_%{mod_name}/*.py[co]