OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Sep-2006 16:05:20
Branch: HEAD Handle: 2006091215051800
Modified files:
openpkg-src/apache2 apache2.patch apache2.spec rc.apache2
Log:
Keep apache2 packaging consistent with apache 1.3 package
o always switch into the Apache run-time directory
inspired by openpkg-src/apache/apache.spec 1.343 -> 1.344
openpkg-src/apache/rc.apache 1.21 -> 1.22
o add OpenDocument stuff to mime.types database
inspired by openpkg-src/apache/apache.patch 1.23 -> 1.24
openpkg-src/apache/apache.spec 1.349 -> 1.350
Summary:
Revision Changes Path
1.12 +26 -0 openpkg-src/apache2/apache2.patch
1.80 +1 -1 openpkg-src/apache2/apache2.spec
1.15 +5 -1 openpkg-src/apache2/rc.apache2
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 apache2.patch
--- openpkg-src/apache2/apache2.patch 30 Apr 2006 08:12:12 -0000 1.11
+++ openpkg-src/apache2/apache2.patch 12 Sep 2006 14:05:18 -0000 1.12
@@ -25,6 +25,32 @@
# Catch some misconfigurations:
case ${apr_found}.${apu_found} in
reconfig.yes)
+Index: docs/conf/mime.types
+--- docs/conf/mime.types.orig 2006-01-29 23:34:37 +0100
++++ docs/conf/mime.types 2006-09-11 17:33:28 +0200
+@@ -265,6 +265,22 @@
+ application/vnd.novadigm.edm
+ application/vnd.novadigm.edx
+ application/vnd.novadigm.ext
++application/vnd.oasis.opendocument.text odt
++application/vnd.oasis.opendocument.spreadsheet ods
++application/vnd.oasis.opendocument.presentation odp
++application/vnd.oasis.opendocument.graphics odg
++application/vnd.oasis.opendocument.chart odc
++application/vnd.oasis.opendocument.formula odf
++application/vnd.oasis.opendocument.image odi
++application/vnd.oasis.opendocument.text-template ott
++application/vnd.oasis.opendocument.spreadsheet-template ots
++application/vnd.oasis.opendocument.presentation-template otp
++application/vnd.oasis.opendocument.graphics-template otg
++application/vnd.oasis.opendocument.chart-template otc
++application/vnd.oasis.opendocument.formula-template oft
++application/vnd.oasis.opendocument.image-template oti
++application/vnd.oasis.opendocument.text-master odm
++application/vnd.oasis.opendocument.text-web oth
+ application/vnd.obn
+ application/vnd.osa.netdeploy
+ application/vnd.palm
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
+++ server/Makefile.in 2006-04-30 09:59:39 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.79 -r1.80 apache2.spec
--- openpkg-src/apache2/apache2.spec 25 Aug 2006 19:15:55 -0000 1.79
+++ openpkg-src/apache2/apache2.spec 12 Sep 2006 14:05:18 -0000 1.80
@@ -39,7 +39,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20060825
+Release: 20060912
# package options (generic)
%option with_mpm prefork
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/rc.apache2
============================================================================
$ cvs diff -u -r1.14 -r1.15 rc.apache2
--- openpkg-src/apache2/rc.apache2 25 Aug 2006 19:15:55 -0000 1.14
+++ openpkg-src/apache2/rc.apache2 12 Sep 2006 14:05:18 -0000 1.15
@@ -37,7 +37,11 @@
%start -u @l_susr@
rcService apache2 enable yes || exit 0
rcService apache2 active yes && exit 0
- @l_prefix@/sbin/apache2 -k start
+ ( cd @l_prefix@/var/apache2/run
+ [ -e @l_prefix@/etc/apache2/apache2.sh ] &&
+ . @l_prefix@/etc/apache2/apache2.sh
+ @l_prefix@/sbin/apache2 -k start
+ ) || exit $?
%stop -u @l_susr@
rcService apache2 enable yes || exit 0
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
