SPECS: apache-mod_python.spec - rel 4 (rebuild with new apache)
glen
glen at pld-linux.org
Wed Dec 21 23:45:09 CET 2005
Author: glen Date: Wed Dec 21 22:45:09 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rel 4 (rebuild with new apache)
---- Files affected:
SPECS:
apache-mod_python.spec (1.73 -> 1.74)
---- Diffs:
================================================================
Index: SPECS/apache-mod_python.spec
diff -u SPECS/apache-mod_python.spec:1.73 SPECS/apache-mod_python.spec:1.74
--- SPECS/apache-mod_python.spec:1.73 Mon Nov 21 10:31:32 2005
+++ SPECS/apache-mod_python.spec Wed Dec 21 23:44:59 2005
@@ -20,7 +20,7 @@
Summary(sv): En inbyggd Python-interpretator för webbservern Apache
Name: apache-mod_%{mod_name}
Version: 3.1.4
-Release: 3
+Release: 4
License: Apache Group License
Group: Networking/Daemons
Source0: http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
@@ -31,7 +31,6 @@
Patch2: %{name}-httpd-not-needed.patch
URL: http://www.modpython.org/
BuildRequires: %{apxs}
-#BuildRequires: apache >= 2.0.44
BuildRequires: apache-devel >= 2.0.52-7
BuildRequires: apr-devel >= 1:1.0.0
BuildRequires: autoconf
@@ -39,9 +38,8 @@
BuildRequires: flex >= 2.5.31
BuildRequires: python
BuildRequires: python-devel >= 2.2
-# without rpm-pythonprov build fails due to missing /usr/lib/rpm/pythondeps.sh
BuildRequires: rpm-pythonprov
-Requires(post,preun): %{apxs}
+Requires: apache(modules-api) = %apache_modules_api
Requires: apache >= 2.0.52-7
Requires: apr >= 1:1.0.0
# apache.py uses pdb module
@@ -49,8 +47,8 @@
%pyrequires_eq python
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
@@ -148,8 +146,7 @@
%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
@@ -186,6 +183,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.74 2005/12/21 22:44:59 glen
+- rel 4 (rebuild with new apache)
+
Revision 1.73 2005/11/21 09:31:32 matkor
- Fix for arch independent modules location. BR: rpm-pythonprov is back. Release 3. STBR.
@@ -221,7 +221,7 @@
- unified
Revision 1.63 2004/07/28 08:03:13 troll
-- removed %%include /usr/lib/rpm/macros.python
+- removed %include /usr/lib/rpm/macros.python
Revision 1.62 2004/05/12 10:11:40 qboosh
- comment for python-devel-tools R
@@ -254,7 +254,8 @@
- Reverted last lame commit.
Revision 1.53 2003/11/10 16:02:17 matkor
-- Version 3.13. Release 5.1. Fails on configure, I don't know how to fix it: configure: error: Qt (>= Qt 2.2.2) (libraries) not found.
+- Version 3.13. Release 5.1. Fails on configure, I don't know how to
+ fix it: configure: error: Qt (>= Qt 2.2.2) (libraries) not found.
Revision 1.52 2003/10/28 15:40:43 wrobell
- ver. 3.1.2b
@@ -324,7 +325,7 @@
- No reports on working dyn. linked mod_python collected on IRC/mailing lists.
Revision 1.33 2002/10/10 11:40:08 marcus
-- use new %%doc
+- use new %doc
Revision 1.32 2002/10/09 13:14:17 kloczek
- use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
@@ -337,12 +338,12 @@
- merge cleanup patch from rawhide.
Revision 1.29 2002/05/21 23:12:41 kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
s/^automake -a -c -f/\%\{__automake\}/; \
- s/^autoconf/\%\{__autoconf\}/"
+ s/^autoconf/\%\{__autoconf\}/"
Revision 1.28 2002/04/25 15:46:31 arturs
-fixed a small typo
+- fixed a small typo
Revision 1.27 2002/04/12 14:03:30 misiek
- security update to 2.7.7; not tested yet
@@ -361,9 +362,9 @@
- release 5
Revision 1.22 2002/02/17 19:01:43 ankry
-- added %%{apxs} local macro to avoid adapter problems
-- fix use of %%{apxs} and %%{_sbindir}/apxs
-- added BR %%{apxs} and Prereq %%{_sbindir}/apxs (if necessary); removed BR apache
+- added %{apxs} local macro to avoid adapter problems
+- fix use of %{apxs} and %{_sbindir}/apxs
+- added BR %{apxs} and Prereq %{_sbindir}/apxs (if necessary); removed BR apache
Revision 1.21 2002/02/16 14:04:54 ankry
- added summaries/descriptions from KSI/RH
@@ -382,7 +383,7 @@
- release 4: rebuild against python 2.2.
Revision 1.16 2002/01/18 02:12:21 kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
Revision 1.15 2001/11/22 15:08:22 filon
- corrected %doc - adds html documetation
@@ -403,10 +404,10 @@
- adapterized, pl translations, BuildRequires: autoconf
Revision 1.10 2001/02/14 11:35:33 wiget
-updated to 2.7.2, not tested yet
+- updated to 2.7.2, not tested yet
Revision 1.9 2000/12/13 11:20:14 wiget
-version 2.6.4, update build/install procedure
+- version 2.6.4, update build/install procedure
Revision 1.8 2000/07/04 21:17:29 kloczek
- cosmetics.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apache-mod_python.spec?r1=1.73&r2=1.74&f=u
More information about the pld-cvs-commit
mailing list