packages: drupal/drupal.conf, drupal/drupal.spec, drupal/drupal-apache1.con...

[glen]

Author: glen                         Date: Tue May  4 15:26:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge drupal-apache1.conf back to main apache config, i don't see what is that different that needs extra file

---- Files affected:
packages/drupal:
   drupal.conf (1.19 -> 1.20) , drupal.spec (1.80 -> 1.81) , drupal-apache1.conf (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/drupal/drupal.conf
diff -u packages/drupal/drupal.conf:1.19 packages/drupal/drupal.conf:1.20
--- packages/drupal/drupal.conf:1.19	Tue May  4 17:24:35 2010
+++ packages/drupal/drupal.conf	Tue May  4 17:26:07 2010
@@ -27,6 +27,9 @@
 		php_value magic_quotes_gpc                  0
 		php_value register_globals                  0
 		php_value session.auto_start                0
+		php_value mbstring.http_input               pass
+		php_value mbstring.http_output              pass
+		php_value mbstring.encoding_translation     0
 		php_value memory_limit                      12M
 	</IfModule>
 	# php5 module under Apache 1.3
@@ -34,6 +37,9 @@
 		php_value magic_quotes_gpc                  0
 		php_value register_globals                  0
 		php_value session.auto_start                0
+		php_value mbstring.http_input               pass
+		php_value mbstring.http_output              pass
+		php_value mbstring.encoding_translation     0
 		php_value memory_limit                      12M
 	</IfModule>
 
@@ -42,6 +48,9 @@
 		php_value magic_quotes_gpc                  0
 		php_value register_globals                  0
 		php_value session.auto_start                0
+		php_value mbstring.http_input               pass
+		php_value mbstring.http_output              pass
+		php_value mbstring.encoding_translation     0
 		php_value memory_limit                      12M
 	</IfModule>
 

================================================================
Index: packages/drupal/drupal.spec
diff -u packages/drupal/drupal.spec:1.80 packages/drupal/drupal.spec:1.81
--- packages/drupal/drupal.spec:1.80	Tue May  4 17:16:31 2010
+++ packages/drupal/drupal.spec	Tue May  4 17:26:07 2010
@@ -13,7 +13,6 @@
 Source1:	%{name}.conf
 Source2:	%{name}.cron
 Source3:	%{name}.PLD
-Source4:	%{name}-apache1.conf
 Patch0:		%{name}-cron.patch
 Patch1:		%{name}-sitesdir.patch
 Patch2:		%{name}-topdir.patch
@@ -203,7 +202,7 @@
 
 ln -s /var/lib/%{name} $RPM_BUILD_ROOT%{_appdir}/files
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
@@ -315,6 +314,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2010/05/04 15:26:07  glen
+- merge drupal-apache1.conf back to main apache config, i don't see what is that different that needs extra file
+
 Revision 1.80  2010/05/04 15:16:31  glen
 - adapter; fix webapp triggers
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal.conf?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal.spec?r1=1.80&r2=1.81&f=u