- integrated/not required with/by 3.1.2b

Changed files:
    apache-mod_python-DESTDIR.patch -> 1.4
    apache-mod_python-flex.patch -> 1.2
    apache-mod_python-no-compile.patch -> 1.3
    apache-mod_python-python.patch -> 1.2

diff --git a/apache-mod_python-DESTDIR.patch b/apache-mod_python-DESTDIR.patch
deleted file mode 100644 (file)
index 57dd719..0000000
--- a/apache-mod_python-DESTDIR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mod_python-3.0.3/Makefile.in.orig  2003-06-11 22:17:54.386314384 +0000
-+++ mod_python-3.0.3/Makefile.in       2003-06-11 22:18:17.801754696 +0000
-@@ -93,7 +93,7 @@
-       @echo
-       @echo "Performing DSO installation."
-       @echo
--      $(INSTALL) src/mod_python.so $(LIBEXECDIR)
-+      $(INSTALL) src/mod_python.so $(DESTDIR)$(LIBEXECDIR)
-       @$(MAKE) install_py_lib
-       @echo
-       @echo "Now don't forget to edit your main config and add"

diff --git a/apache-mod_python-flex.patch b/apache-mod_python-flex.patch
deleted file mode 100644 (file)
index c21f45b..0000000
--- a/apache-mod_python-flex.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur mod_python-3.1.0a.orig/dist/setup.py.in mod_python-3.1.0a/dist/setup.py.in
---- mod_python-3.1.0a.orig/dist/setup.py.in    Thu May 29 16:15:46 2003
-+++ mod_python-3.1.0a/dist/setup.py.in Wed Oct  8 01:17:53 2003
-@@ -40,7 +40,7 @@
-                                   "src/psp_parser.c",
-                                   "src/_pspmodule.c"],
-                                  include_dirs=["src/include"],
--                                 libraries=["l"]
-+                                 libraries=["fl"]
-                                  )
-                        ]
-           )
-diff -Nur mod_python-3.1.0a.orig/src/Makefile.in mod_python-3.1.0a/src/Makefile.in
---- mod_python-3.1.0a.orig/src/Makefile.in     Thu Aug 14 17:24:42 2003
-+++ mod_python-3.1.0a/src/Makefile.in  Wed Oct  8 01:17:44 2003
-@@ -63,7 +63,7 @@
- # requires flex 2.5.31 for reentrant support
- LEX=/usr/local/bin/flex
- INCLUDES=@INCLUDES@
--LIBS=@LIBS@ -ll
-+LIBS=@LIBS@ -lfl
- LDFLAGS=@LDFLAGS@
- OPT=
- CFLAGS=$(OPT) $(INCLUDES) 

diff --git a/apache-mod_python-no-compile.patch b/apache-mod_python-no-compile.patch
deleted file mode 100644 (file)
index 25860fc..0000000
--- a/apache-mod_python-no-compile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mod_python-3.0.3/Makefile.in.orig  2003-06-11 22:36:03.877686520 +0000
-+++ mod_python-3.0.3/Makefile.in       2003-06-11 22:36:41.091029232 +0000
-@@ -104,13 +104,11 @@
- 
- install_py_lib:
-       cd dist && $(MAKE) install_py_lib
--#     $(INSTALL) -d $(PY_STD_LIB)/site-packages/mod_python
--#     @for f in `ls lib/python/mod_python/*.py`; \
--#     do \
--#             $(INSTALL) $$f $(PY_STD_LIB)/site-packages/mod_python; \
--#     done
--#     ${PYTHON_BIN} $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
--#     ${PYTHON_BIN} -O $(PY_STD_LIB)/compileall.py $(PY_STD_LIB)/site-packages/mod_python
-+      $(INSTALL) -d $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python
-+      @for f in `ls lib/python/mod_python/*.py`; \
-+      do \
-+              $(INSTALL) $$f $(DESTDIR)$(PY_STD_LIB)/site-packages/mod_python; \
-+      done
- 
- clean:
-       cd src && $(MAKE) clean

diff --git a/apache-mod_python-python.patch b/apache-mod_python-python.patch
deleted file mode 100644 (file)
index 60b8854..0000000
--- a/apache-mod_python-python.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mod_python-3.1.0a.orig/dist/Makefile.in mod_python-3.1.0a/dist/Makefile.in
---- mod_python-3.1.0a.orig/dist/Makefile.in    Fri Jun 13 04:52:03 2003
-+++ mod_python-3.1.0a/dist/Makefile.in Wed Oct  8 01:16:59 2003
-@@ -73,7 +73,7 @@
- # this may require root privilidges
- install_py_lib: mod_python src
-       @cd src; $(MAKE) psp_parser.c
--      $(PYTHON_BIN) setup.py install --optimize 2 --force; \
-+      $(PYTHON_BIN) setup.py install --optimize 2 --root=$(DESTDIR); \
- 
- mod_python.so:
-       @echo "Please place a WIN32 compiled mod_python.so in this directory"