smeserver-ocsinventory/contribs7/smeserver-ocsinventory-0.1-modPerl2.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs
--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs       2008-09-11 14:33:45.000000000 +0200
+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs     2008-10-15 21:17:39.000000000 +0200
@@ -56,7 +56,19 @@
   # Which version of mod_perl we are using
   # For mod_perl <= 1.999_21, replace VERSION_MP by 1
   # For mod_perl > 1.999_21, replace VERSION_MP by 2
-  PerlSetEnv OCS_MODPERL_VERSION 1
+  {
+       my $version = 'unknown';
+       my $modPerl = `rpm -q mod_perl`;
+       $modPerl =~ /^mod_perl-(\d*)/;
+       $version = $1.
+       if ($version =~ /^1/){
+               $version = 1;
+       }
+       elsif ($version =~ /^2/){
+               $version = 2;
+       }
+       $OUT .= "  PerlSetEnv OCS_MODPERL_VERSION $version\n";
+  }
 
   # Master Database settings
   # Replace DATABASE_SERVER by hostname or ip of MySQL server for WRITE
1	slords	1.1	diff -Nur -x '.orig' -x '.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs
2			--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs 2008-09-11 14:33:45.000000000 +0200
3			+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs 2008-10-15 21:17:39.000000000 +0200
4			@@ -56,7 +56,19 @@
5			# Which version of mod_perl we are using
6			# For mod_perl <= 1.999_21, replace VERSION_MP by 1
7			# For mod_perl > 1.999_21, replace VERSION_MP by 2
8			- PerlSetEnv OCS_MODPERL_VERSION 1
9			+ {
10			+ my $version = 'unknown';
11			+ my $modPerl = `rpm -q mod_perl`;
12			+ $modPerl =~ /^mod_perl-(\d*)/;
13			+ $version = $1.
14			+ if ($version =~ /^1/){
15			+ $version = 1;
16			+ }
17			+ elsif ($version =~ /^2/){
18			+ $version = 2;
19			+ }
20			+ $OUT .= " PerlSetEnv OCS_MODPERL_VERSION $version\n";
21			+ }
22
23			# Master Database settings
24			# Replace DATABASE_SERVER by hostname or ip of MySQL server for WRITE