X-Git-Url: https://git.pld-linux.org/?p=packages%2Fapache-mod_python.git;a=blobdiff_plain;f=apache-mod_python.spec;h=bee620f14809eb129f8cdf6f75f497d3231ee4c7;hp=fc4d8a1bfb37da64a10446c41a073dbbca0e202d;hb=b81b8ef0826beefd8f47e902cac924a0ff9efa39;hpb=ff1c932ff198e2806022a8b24b02a430da2a3fd1

diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index fc4d8a1..bee620f 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -1,5 +1,5 @@
 %define		mod_name	python
-%define 	apxs		/usr/sbin/apxs
+%define		apxs		/usr/sbin/apxs
 Summary:	An embedded Python interpreter for the Apache Web server
 Summary(cs.UTF-8):	Vestavěný interpret Pythonu pro WWW server Apache
 Summary(da.UTF-8):	En indbygget Python-fortolker for webtjeneren Apache
@@ -18,17 +18,15 @@ Summary(sk.UTF-8):	Interpreter jazyka Perl pre webový server Apache
 Summary(sl.UTF-8):	Vključeni pythonski tolmač za spletni strežnik Apache
 Summary(sv.UTF-8):	En inbyggd Python-interpretator för webbservern Apache
 Name:		apache-mod_%{mod_name}
-Version:	3.2.10
+Version:	3.4.1
 Release:	2
-License:	Apache Group License
-Group:		Networking/Daemons
-Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
-# Source0-md5:	cc6439f546a6e70cfff7ca51b8c62541
+License:	Apache
+Group:		Networking/Daemons/HTTP
+Source0:	http://dist.modpython.org/dist/mod_%{mod_name}-%{version}.tgz
+# Source0-md5:	d27804354f1808ad55d432fd76ed9d05
 Source1:	%{name}.conf
 Patch0:		%{name}-httpd-not-needed.patch
-Patch1:		%{name}-ldflags.patch
 URL:		http://www.modpython.org/
-BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.52-7
 BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	autoconf
@@ -45,8 +43,8 @@ Requires:	python-devel-tools
 %requires_eq	python-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 Mod_python is a module that embeds the Python language interpreter
@@ -126,7 +124,6 @@ prestandan jämfört med den traditionella CGI-metoden.
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__aclocal}
@@ -137,12 +134,12 @@ prestandan jämfört med den traditionella CGI-metoden.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_bindir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/60_mod_python.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/60_mod_python.conf
 %py_postclean
 
 %clean
@@ -158,10 +155,14 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc-html/* README COPYRIGHT NEWS CREDITS
+%doc doc-html/* README.md COPYRIGHT NEWS CREDITS
 %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
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_bindir}/mod_python
+%attr(755,root,root) %{apachelibdir}/*.so
 %dir %{py_sitedir}/mod_%{mod_name}
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/mod_%{mod_name}-*.egg-info
+%endif
 %attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
 %{py_sitedir}/mod_%{mod_name}/*.py[co]