packages (AC-branch): gallery/gallery-PLD.patch, gallery/gallery.spec - up ...

[glen]

Author: glen                         Date: Thu Aug 27 07:19:24 2009 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- up to 1.5.10

---- Files affected:
packages/gallery:
   gallery-PLD.patch (1.2.2.4 -> 1.2.2.5) , gallery.spec (1.38.2.7 -> 1.38.2.8) 

---- Diffs:

================================================================
Index: packages/gallery/gallery-PLD.patch
diff -u packages/gallery/gallery-PLD.patch:1.2.2.4 packages/gallery/gallery-PLD.patch:1.2.2.5
--- packages/gallery/gallery-PLD.patch:1.2.2.4	Tue Aug 21 08:31:39 2007
+++ packages/gallery/gallery-PLD.patch	Thu Aug 27 09:19:19 2009
@@ -1,14 +1,14 @@
---- ./lib/url.php~	2005-12-26 23:23:03.000000000 +0200
-+++ ./lib/url.php	2006-01-27 00:45:58.479261981 +0200
-@@ -17,7 +17,7 @@
+--- gallery-1.5.10/lib/url.php~	2009-08-27 10:16:20.000000000 +0300
++++ gallery-1.5.10/lib/url.php	2009-08-27 10:17:03.141519923 +0300
+@@ -38,7 +38,7 @@
  	$currentFile = __FILE__;
  	if ( $currentFile == '/usr/share/gallery/lib/url.php') {
- 		/* We assum Gallery runs on as Debian Package */
+ 		/* We assume Gallery runs on as Debian Package */
 -		define ("GALLERY_CONFDIR", "/etc/gallery");
 +		define ("GALLERY_CONFDIR", "/usr/share/gallery");
  		define ("GALLERY_SETUPDIR", "/var/lib/gallery/setup");
- 	} else {
- 		define ("GALLERY_CONFDIR", dirname(dirname(__FILE__)));
+ 	}
+ 	else {
 --- gallery/setup/config_data.inc	2006-01-10 07:41:32.000000000 +0200
 +++ /tmp/config_data.inc	2006-01-27 00:53:36.000000000 +0200
 @@ -330,7 +330,7 @@
@@ -126,14 +126,14 @@
  		${str_replace('.', '', $outfile) . '_file'} = 1;
  	}
  }
---- gallery/setup/write.inc~	2007-08-21 09:25:22.660536691 +0300
-+++ gallery/setup/write.inc	2007-08-21 09:29:42.406424831 +0300
-@@ -193,7 +193,7 @@
+--- gallery-1.5.10/setup/write.inc~	2009-08-27 10:17:59.000000000 +0300
++++ gallery-1.5.10/setup/write.inc	2009-08-27 10:18:26.424844612 +0300
+@@ -207,7 +207,7 @@
  		$message .= "<br><br>";
- 	else
- 		$message = "";
--	$message .= gTranslate('config', "We highly suggest that you run 'secure.sh', or chmod your .htaccess and config.php to 644 for increased security.");
-+	$message .= gTranslate('config', "We highly suggest that you run '/usr/share/gallery/secure.sh' for increased security.");
+ 	}
+ 	else {
+-		$message = gTranslate('config', "We highly suggest that you run 'secure.sh', or chmod your .htaccess and config.php to 644 for increased security.");
++		$message = gTranslate('config', "We highly suggest that you run '/usr/share/gallery/secure.sh' for increased security.");
+ 	}
  }
  
- // Inform the user that their gallery is not secure until they remove the 'resetadmin' file

================================================================
Index: packages/gallery/gallery.spec
diff -u packages/gallery/gallery.spec:1.38.2.7 packages/gallery/gallery.spec:1.38.2.8
--- packages/gallery/gallery.spec:1.38.2.7	Fri Mar 14 11:22:24 2008
+++ packages/gallery/gallery.spec	Thu Aug 27 09:19:19 2009
@@ -2,12 +2,12 @@
 Summary:	Web based photo album viewer and creator
 Summary(pl):	Przegl±darka i generator albumów zdjêæ w postaci stron WWW
 Name:		gallery
-Version:	1.5.7
-Release:	2
+Version:	1.5.10
+Release:	1
 License:	GPL
 Group:		Applications/Publishing
 Source0:	http://dl.sourceforge.net/gallery/%{name}-%{version}.tar.gz
-# Source0-md5:	ff6ca5652e1c4007775bfc905b1a3b55
+# Source0-md5:	a8147e62b248baf25cdd2a79a63453eb
 Source1:	http://dl.sourceforge.net/gallery/pl_PL-1.5.2.tar.gz
 # Source1-md5:	1dd07a63d96299d8f5e4cc03342d318e
 Source2:	%{name}-apache.conf
@@ -59,7 +59,7 @@
 pozostawienie plików instalacyjnych mog³oby byæ niebezpieczne.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 
 tar zxf %{SOURCE1} -C locale
@@ -153,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38.2.8  2009/08/27 07:19:19  glen
+- up to 1.5.10
+
 Revision 1.38.2.7  2008/03/14 10:22:24  glen
 - remove backups; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gallery/gallery-PLD.patch?r1=1.2.2.4&r2=1.2.2.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gallery/gallery.spec?r1=1.38.2.7&r2=1.38.2.8&f=u