rpms/gallery2/FC-4 gallery2-config-path.patch, NONE, 1.1 gallery2.spec, 1.1, 1.2

[John Berninger (jwb)]

Author: jwb

Update of /cvs/extras/rpms/gallery2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26006/FC-4

Modified Files:
	gallery2.spec 
Added Files:
	gallery2-config-path.patch 
Log Message:
Add patch for moving config.php to /srv/gallery2 to avoid potential issues with
ro /usr.


gallery2-config-path.patch:

--- NEW FILE gallery2-config-path.patch ---
diff -ruN g2.orig/bootstrap.inc gallery2/bootstrap.inc
--- g2.orig/bootstrap.inc	2006-05-24 14:46:46.000000000 -0400
+++ gallery2/bootstrap.inc	2006-06-08 13:49:13.000000000 -0400
@@ -36,7 +36,7 @@
 $gallery =& $GLOBALS['gallery'];
 
 if (!defined('GALLERY_CONFIG_DIR')) {
-    define('GALLERY_CONFIG_DIR', dirname(__FILE__));
+    define('GALLERY_CONFIG_DIR', '/srv/gallery2');
 }
 @include(GALLERY_CONFIG_DIR . '/config.php');
 
diff -ruN g2.orig/install/steps/MultisiteStep.class gallery2/install/steps/MultisiteStep.class
--- g2.orig/install/steps/MultisiteStep.class	2006-05-24 14:38:42.000000000 -0400
+++ gallery2/install/steps/MultisiteStep.class	2006-06-08 14:20:08.000000000 -0400
@@ -44,7 +44,7 @@
 	    if ($_POST['isMultisite'] == '0') {
 		$this->_isMultisite = false;
 		$baseDir = dirname(dirname(dirname(__FILE__)));
-		$_SESSION['configPath'] = $baseDir;
+		$_SESSION['configPath'] = '/srv/gallery2';
 		$this->setComplete(true);
 		$this->readConfigFile();
 		/* Remember the value also for the storage and database setup steps */
diff -ruN g2.orig/install/templates/Multisite.html gallery2/install/templates/Multisite.html
--- g2.orig/install/templates/Multisite.html	2006-05-24 14:38:43.000000000 -0400
+++ gallery2/install/templates/Multisite.html	2006-06-08 14:21:50.000000000 -0400
@@ -22,7 +22,7 @@
       </label>
       <br/>
       <?php printf(_('This is the default installation type. Choose this installation type if you want to install a new Gallery in the directory %s which will be accessible with the URL %s.'),
-                   '<tt>' . $templateData['galleryDir'] . '</tt>', '<tt>' . $templateData['galleryUrl'] . '</tt>') ?>
+                   '<tt>' . $_SESSION['configPath'] . '</tt>', '<tt>' . $templateData['galleryUrl'] . '</tt>') ?>
     </div>
     <div class="multisite">
       <input type="radio" id="rbMultisite" name="isMultisite" value="1" onclick="linkToggle(1)"


Index: gallery2.spec
===================================================================
RCS file: /cvs/extras/rpms/gallery2/FC-4/gallery2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gallery2.spec	7 Jun 2006 03:51:38 -0000	1.1
+++ gallery2.spec	8 Jun 2006 18:54:59 -0000	1.2
@@ -6,7 +6,7 @@
 Name: gallery2
 Version: 2.1
 Group: Applications/Publishing
-Release: 0.21.svn20060524%{?dist}
+Release: 0.22.svn20060524%{?dist}
 License: GPL
 # Source0: http://dl.sf.net/gallery/gallery-2.1-developer.tar.gz
 # Using SVN tarball for source to resolve provides issues sanely
@@ -22,6 +22,7 @@
 
 Patch0: gallery2-perl-location.patch
 Patch1: gallery2-login-txt-path.patch
+Patch2: gallery2-config-path.patch
 
 %package albumselect
 Summary: Albumselect module for Gallery 2
@@ -865,11 +866,15 @@
 %{installprefix}/gallery2/themes/tile/
 
 %changelog
-* Tue Jun  6 2006 John Berninger <johnw at berningeronline dot net> - 2.1.0.21.svn20060524
+* Thu Jun  8 2006 John Berninger <johnw at berningeronline dot net> - 2.1-0.22.svn20060524
+- Fix problem with config.php getting put into /usr/share/gallery2 - move it
+  to /srv/gallery2 to avoid issues with a ro /usr partition
+
+* Tue Jun  6 2006 John Berninger <johnw at berningeronline dot net> - 2.1-0.21.svn20060524
 - login.txt in /srv/gallery2, patch install/steps/AuthenticateStep.class to
   look there for it to avoid ugly errors that we shouldn't see.
 
-* Tue Jun  6 2006 John Berninger <johnw at berningeronline dot net> - 2.1.0.20.svn20060524
+* Tue Jun  6 2006 John Berninger <johnw at berningeronline dot net> - 2.1-0.20.svn20060524
 - Move login.txt to /etc/gallery2 with a symlink to deal with potentially ro
   /usr