packages: phorum/phorum.spec, phorum/cli-progs.patch (REMOVED), phorum/mult...

[glen]

Author: glen                         Date: Mon May 14 17:38:05 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.2.17

---- Files affected:
packages/phorum:
   phorum.spec (1.71 -> 1.72) , cli-progs.patch (1.1 -> NONE)  (REMOVED), multibyte_description.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/phorum/phorum.spec
diff -u packages/phorum/phorum.spec:1.71 packages/phorum/phorum.spec:1.72
--- packages/phorum/phorum.spec:1.71	Wed Feb  2 15:57:59 2011
+++ packages/phorum/phorum.spec	Mon May 14 19:38:00 2012
@@ -8,12 +8,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}.16
-Release:	0.5
+Version:	%{mainver}.17
+Release:	0.1
 License:	Apache-like
 Group:		Applications/WWW
 Source0:	http://www.phorum.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	fb35b7b4a2561c83c76488f9a6186ad7
+# Source0-md5:	a88b423df3b95799a98d33b4765b86f1
 Source3:	apache.conf
 Patch0:		paths.patch
 Patch1:		mysql.patch
@@ -22,11 +22,9 @@
 Patch4:		sys-recaptcha.patch
 Patch5:		enable-mbstring.patch
 Patch6:		no-pear-json.patch
-Patch9:		multibyte_description.patch
 Patch10:	translate-macros.patch
 Patch11:	wordwrap.patch
 Patch12:	unhide-errors.patch
-Patch13:	cli-progs.patch
 URL:		http://www.phorum.org/
 BuildRequires:	iconv
 BuildRequires:	rpm-php-pearprov
@@ -247,7 +245,7 @@
 
 %prep
 %setup -q
-find '(' -name '*.php' -o -name '*.css' -o -name '*.js' -o -name '*.html' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+%undos -f php,css,js,html,txt
 
 install -d htdocs/admin examples
 
@@ -255,14 +253,13 @@
 find -name .htaccess | xargs rm -v
 
 # php-phpmailer
-rm -rf mods/smtp_mail/phpmailer
+%{__rm} -r mods/smtp_mail/phpmailer
 
 # php-recaptcha
-rm -rf mods/spamhurdles/captcha/recaptcha-php-1.9
-rm -f mods/spamhurdles/MANIFEST
+%{__rm} -r mods/spamhurdles/captcha/recaptcha-php-1.9
 
 # php-json
-rm -f include/api/json-pear.php
+%{__rm} include/api/json-pear.php
 
 mv include/db/config.php.sample .
 mv include/api/examples examples/api
@@ -280,7 +277,7 @@
 mv docs/pdf pdfdoc
 
 # kill old files by phorum
-rm post.php
+%{__rm} post.php
 
 # fixup structure, move public files to htdocs.
 mv *.php images htdocs
@@ -325,6 +322,7 @@
 # no paths should contain ./mods/, ./includes, those should be marked by
 # PHORUM_DIR or PHORUM_INCLUDES_DIR constants
 # grep -Fr ./mods/ .
+# grep -Fr ./includes/ .
 # you can rm -rf these dirs to simplify:
 # rm -rf htmldoc/ docbook/ docs/ examples/ *.lang
 
@@ -335,11 +333,9 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -348,9 +344,9 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{_cachedir}}
 cp -a *.php htdocs include mods templates scripts $RPM_BUILD_ROOT%{_appdir}
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a config.php.sample $RPM_BUILD_ROOT%{_sysconfdir}/config.php
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p config.php.sample $RPM_BUILD_ROOT%{_sysconfdir}/config.php
 
 cat > langmap <<'EOF'
 cs czech
@@ -535,7 +531,7 @@
 # TODO: check and use external pkg
 %dir %{_appdir}/include/javascript
 %{_appdir}/include/javascript/jquery-1.4.4.min.js
-%{_appdir}/include/javascript/jquery.bgiframe-2.1.1.min.js
+%{_appdir}/include/javascript/jquery.bgiframe-2.1.2.min.js
 %{_appdir}/include/javascript/jquery.json-1.3.min.js
 %{_appdir}/include/javascript/phorum-javascript-library.php
 
@@ -633,6 +629,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2012/05/14 17:38:00  glen
+- up to 5.2.17
+
 Revision 1.71  2011/02/02 14:57:59  glen
 - verified image pkg, update note about bundled jquery
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/phorum/phorum.spec?r1=1.71&r2=1.72