X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=c66df8eef0314435a881d8aedd29f7aba4240e08;hp=ef0a749a15696514bdc544cfc0f3f9c708ed0e52;hb=151bab84a217d4bd4d4a232f21b07a22edc0947c;hpb=1a7b3fd3693f9205c7ead02133490b94518cbb1c

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index ef0a749..c66df8e 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -18,34 +18,37 @@ 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:	3.1.3
+Version:	3.1.4
 Release:	5
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
-# Source0-md5:	2e1983e35edd428f308b0dfeb1c23bfe
+# Source0-md5:	607175958137b06bcda91110414c82a1
 Source1:	%{name}.conf
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-apr-status-is-success.patch
+Patch2:		%{name}-httpd-not-needed.patch
+Patch3:		%{name}-ldflags.patch
 URL:		http://www.modpython.org/
 BuildRequires:	%{apxs}
-BuildRequires:	apache >= 2.0.44
-BuildRequires:	apache-devel >= 2.0.44
-BuildRequires:	apr-devel >= 1:0.9.4-1
+BuildRequires:	apache-devel >= 2.0.52-7
+BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	flex >= 2.5.31
+BuildRequires:	python
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	rpm-pythonprov
-Requires(post,preun):	%{apxs}
-Requires:	apache >= 2.0.44
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	apache(modules-api) = %apache_modules_api
+Requires:	apr >= 1:1.0.0
 # apache.py uses pdb module
 Requires:	python-devel-tools
-%pyrequires_eq	python
+%requires_eq	python-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 Mod_python is a module that embeds the Python language interpreter
@@ -128,47 +131,42 @@ prestandan j
 %patch0
 %endif
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
 %{__autoconf}
-
-# new apache needs it
-CFLAGS="-DEAPI %{rpmcflags}"
 %configure \
 	--with-apxs=%{apxs}
-
 %{__make} dso
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/60_mod_python.conf
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	%service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc doc-html/* README COPYRIGHT NEWS CREDITS
-%{_sysconfdir}/httpd.conf/60_mod_python.conf
+%doc examples
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 %dir %{py_sitedir}/mod_%{mod_name}
 %attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so