packages: phorum/paths.patch, phorum/phorum.spec - up to 5.2.15a

[glen]

Author: glen                         Date: Thu Apr  1 14:08:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.2.15a

---- Files affected:
packages/phorum:
   paths.patch (1.20 -> 1.21) , phorum.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: packages/phorum/paths.patch
diff -u packages/phorum/paths.patch:1.20 packages/phorum/paths.patch:1.21
--- packages/phorum/paths.patch:1.20	Thu Apr  1 15:24:27 2010
+++ packages/phorum/paths.patch	Thu Apr  1 16:08:07 2010
@@ -293,6 +293,25 @@
                  include($path);
                  $content .= ob_get_contents();
                  ob_end_clean();
+--- phorum-5.2.15a/htdocs/javascript.php~	2010-04-01 16:25:23.000000000 +0300
++++ phorum-5.2.15a/htdocs/javascript.php	2010-04-01 16:39:30.384965963 +0300
+@@ -31,14 +31,14 @@
+ $module_registrations[] = array(
+     'module'    => 'core',
+     'source'    => 'file(include/ajax/json2.js.php)',
+-    'cache_key' => filemtime('./include/ajax/json2.js.php')
++    'cache_key' => filemtime(PHORUM_INCLUDES_DIR.'/ajax/json2.js.php')
+ );
+ 
+ // Add core Phorum posting form object manipulation client JavaScript code.
+ $module_registrations[] = array(
+     'module'    => 'core',
+     'source'    => 'file(include/posting/form_objects.js.php)',
+-    'cache_key' => filemtime('./include/posting/form_objects.js.php')
++    'cache_key' => filemtime(PHORUM_INCLUDES_DIR.'/posting/form_objects.js.php')
+ );
+ 
+ 
 --- phorum/htdocs/css.php~	2010-01-12 19:27:06.000000000 +0200
 +++ phorum/htdocs/css.php	2010-01-12 19:30:47.253394705 +0200
 @@ -274,7 +274,11 @@

================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.49 packages/phorum/phorum.spec:1.50
--- packages/phorum/phorum.spec:1.49	Thu Apr  1 15:24:27 2010
+++ packages/phorum/phorum.spec	Thu Apr  1 16:08:07 2010
@@ -7,12 +7,12 @@
 Summary:	Phorum is a web based message board written in PHP
 Summary(pl.UTF-8):	Phorum - implementacja forum WWW w PHP
 Name:		phorum
-Version:	%{mainver}.14
+Version:	%{mainver}.15a
 Release:	0.62
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	944211b4f195a538bcb6e2883d2187c5
+# Source0-md5:	e1a0a3974fc60ced71c95d282e7bcc3e
 Source1:	http://www.phorum.org/phorum5/file.php/download/65/2522/%{name}-estonian-5.2.7a.zip
 # Source1-md5:	cd2d5fb9b0b17da0d805209ac76b58d4
 Source2:	http://www.phorum.org/phorum5/file.php/65/4131/Russian-Utf8.zip
@@ -29,7 +29,8 @@
 BuildRequires:	glibc-misc
 BuildRequires:	iconv
 BuildRequires:	rpm-php-pearprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.533
+BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 Requires:	%{name}(DB_Provider)
 #Requires:	php-date
@@ -252,7 +253,7 @@
 
 %prep
 %setup -q -a1 -a2
-find '(' -name '*.php' -o -name '*.css' -o -name '*.js' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+find '(' -name '*.php' -o -name '*.css' -o -name '*.js' -o -name '*.html' ')' -print0 | xargs -0 %undos
 
 install -d htdocs/admin examples
 
@@ -607,6 +608,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2010/04/01 14:08:07  glen
+- up to 5.2.15a
+
 Revision 1.49  2010/04/01 13:24:27  glen
 - fix spamhurdles file
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/paths.patch?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phorum/phorum.spec?r1=1.49&r2=1.50&f=u