SPECS: dokuwiki.spec - merge update to 20080505 from DEVEL (branch: 1.3.2)

[glen]

Author: glen                         Date: Mon Aug 18 18:09:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge update to 20080505 from DEVEL (branch: 1.3.2)

---- Files affected:
SPECS:
   dokuwiki.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/dokuwiki.spec
diff -u SPECS/dokuwiki.spec:1.34 SPECS/dokuwiki.spec:1.35
--- SPECS/dokuwiki.spec:1.34	Tue Jun 17 07:11:53 2008
+++ SPECS/dokuwiki.spec	Mon Aug 18 20:09:16 2008
@@ -1,13 +1,15 @@
 # $Revision$, $Date$
+%define		subver	2008-05-05
+%define		ver	%(echo %{subver} | tr -d -)
 Summary:	PHP-based Wiki webapplication
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
-Version:	20070626b
-Release:	3
+Version:	%{ver}
+Release:	0.3
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-2007-06-26b.tgz
-# Source0-md5:	84e9b5e8e617658bb0264aa3836f23b3
+Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5:	1a70a2ab847b704b629cbbe212ce9a00
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	%{name}-find-lang.sh
@@ -79,7 +81,7 @@
 pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
 %prep
-%setup -q -n %{name}-2007-06-26b
+%setup -q -n %{name}-%{subver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -100,6 +102,9 @@
 rm -f inc/geshi.php
 rm -rf inc/geshi
 
+# cleanup backups after patching
+find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_localstatedir},%{_appdir}/{bin,inc,lib}}
@@ -172,7 +177,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README VERSION
+%doc README
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
@@ -223,6 +228,7 @@
 %dir %{_appdir}/lib/plugins
 %dir %{_appdir}/lib/plugins/acl
 %{_appdir}/lib/plugins/acl/*.*
+%{_appdir}/lib/plugins/acl/pix
 %dir %{_appdir}/lib/plugins/config
 %{_appdir}/lib/plugins/config/*.*
 %{_appdir}/lib/plugins/config/settings
@@ -236,6 +242,8 @@
 %{_appdir}/lib/plugins/importoldchangelog
 %{_appdir}/lib/plugins/importoldindex
 %{_appdir}/lib/plugins/info
+%dir %{_appdir}/lib/plugins/popularity
+%{_appdir}/lib/plugins/popularity/*.*
 %{_appdir}/lib/plugins/*.php
 %{_appdir}/lib/images
 %{_appdir}/lib/scripts
@@ -252,17 +260,19 @@
 %dir %attr(770,root,http) %{_localstatedir}/media/wiki
 %dir %attr(770,root,http) %{_localstatedir}/meta
 %dir %attr(770,root,http) %{_localstatedir}/pages
-%dir %attr(770,root,http) %{_localstatedir}/pages/playground
 %dir %attr(770,root,http) %{_localstatedir}/pages/wiki
+%dir %attr(770,root,http) %{_localstatedir}/pages/playground
+%dir %attr(770,root,http) %{_localstatedir}/tmp
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/attic/_dummy
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/cache/_dummy
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/index/_dummy
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/locks/_dummy
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/media/wiki/dokuwiki-128.png
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/meta/_dummy
-%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/playground/playground.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/dokuwiki.txt
 %attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/wiki/syntax.txt
+%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/pages/playground/playground.txt
+%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/tmp/_dummy
 
 %files setup
 %defattr(644,root,root,755)
@@ -274,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2008/08/18 18:09:16  glen
+- merge update to 20080505 from DEVEL (branch: 1.3.2)
+
 Revision 1.34  2008/06/17 05:11:53  glen
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dokuwiki.spec?r1=1.34&r2=1.35&f=u