From: wrobell <wrobell@pld-linux.org>
Date: Thu, 27 Feb 2003 09:53:59 +0000 (+0000)
Subject: - ver. 3.0.1
X-Git-Tag: auto/ac/apache-mod_python-3_1_2b-1~24
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=commitdiff_plain;h=a58b005acf437a8e5c3e959141076ea4fe81bc11

- ver. 3.0.1
- mod_python 3.0 is donated to Apache Software Foundation (license has changed)
- it should work when linked with shared Python library
- added patch to not compile Python modules with Makefile; let's do it
  manually - the patch replaces Makefile-in.patch
- it works only with apache 2.0.x (or later maybe, too)
- nfy

Changed files:
    apache-mod_python.spec -> 1.37
---

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index 0b33f21..42a6bc5 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,14 +25,14 @@ 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
+Patch2:		%{name}-no-compile.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
@@ -34,9 +40,8 @@ Patch4:		%{name}-static-lib-dir-fix.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
@@ -128,8 +133,8 @@ prestandan j
 #%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch3 -p1
+#%patch4 -p1
 
 %build
 %{__aclocal}
@@ -148,18 +153,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 +176,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]