packages: magento/magento.spec, magento/local.xml-empty.patch (NEW) - inclu...

[glen]

Author: glen                         Date: Tue Aug 31 05:59:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- include default config in package files (empty so it can be treated as missing)

---- Files affected:
packages/magento:
   magento.spec (1.7 -> 1.8) , local.xml-empty.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/magento/magento.spec
diff -u packages/magento/magento.spec:1.7 packages/magento/magento.spec:1.8
--- packages/magento/magento.spec:1.7	Mon Aug 30 21:13:27 2010
+++ packages/magento/magento.spec	Tue Aug 31 07:59:27 2010
@@ -23,6 +23,7 @@
 Patch3:		%{name}-1.3.2.4-homelist_random.patch
 Patch4:		pld-mysql-root.patch
 Patch5:		amcustomerattr-optional.patch
+Patch6:		local.xml-empty.patch
 BuildRequires:	rpmbuild(macros) >= 1.553
 Requires:	php-common >= 4:%{php_min_version}
 Requires:	php-ctype
@@ -84,12 +85,13 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
-# default config
-cp app/etc/local.xml{.template,}
+# include default config in package files (empty so it can be treated as missing)
+> app/etc/local.xml
 
 # make docs to pack
 install -d doc
@@ -199,6 +201,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2010/08/31 05:59:27  glen
+- include default config in package files (empty so it can be treated as missing)
+
 Revision 1.7  2010/08/30 19:13:27  glen
 - up to 1.4.1.1; drop bundled Zend
 

================================================================
Index: packages/magento/local.xml-empty.patch
diff -u /dev/null packages/magento/local.xml-empty.patch:1.1
--- /dev/null	Tue Aug 31 07:59:33 2010
+++ packages/magento/local.xml-empty.patch	Tue Aug 31 07:59:27 2010
@@ -0,0 +1,11 @@
+--- magento-1.4.1.1/./app/Mage.php~	2010-08-30 21:45:00.000000000 +0300
++++ magento-1.4.1.1/./app/Mage.php	2010-08-31 08:48:08.459842890 +0300
+@@ -641,7 +641,7 @@
+ 
+             self::$_isInstalled = false;
+ 
+-            if (is_readable($localConfigFile)) {
++            if (is_readable($localConfigFile) && filesize($localConfigFile)) {
+                 $localConfig = simplexml_load_file($localConfigFile);
+                 date_default_timezone_set('UTC');
+                 if (($date = $localConfig->global->install->date) && strtotime($date)) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/magento/magento.spec?r1=1.7&r2=1.8&f=u