X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dokuwiki.spec;h=7cfd57d158c996ad7df4d906fcf6abe36d46068c;hb=b196ede3ef3f90c787928dc2ae85fe7963134196;hp=0bbca9f62d3c02d4cf25006ee424501ae661e876;hpb=9e71cc6a6f4a4ee24b80928edc0c0fabf7b4520a;p=packages%2Fdokuwiki.git

diff --git a/dokuwiki.spec b/dokuwiki.spec
index 0bbca9f..7cfd57d 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,20 +1,19 @@
-%define		subver	2013-10-28
+%define		subver	2014-09-29d
 %define		ver		%(echo %{subver} | tr -d -)
 #define		snap	1
-%define		rc_	1
+#define		rc_	1
 %define		php_min_version 5.2.4
 %include	/usr/lib/rpm/macros.php
 Summary:	PHP-based Wiki webapplication
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	0.2
+Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-#Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-Source0:	http://download.dokuwiki.org/src/dokuwiki/%{name}-rc%{subver}.tgz
-# Source0-md5:	f476b54a3679d35cdd8746db57c9c6a3
-#Source0:	http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
+# Source0Download: http://download.dokuwiki.org/archive
+Source0:	http://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5:	2bf2d6c242c00e9c97f0647e71583375
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	http://glen.alkohol.ee/pld/jude.png
@@ -52,7 +51,7 @@ Patch26:	system-lessphp.patch
 URL:		https://www.dokuwiki.org/
 BuildRequires:	fslint
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.520
+BuildRequires:	rpmbuild(macros) >= 1.693
 Requires:	jquery >= 1.8
 #Requires:	jquery >= 1.9.1
 Requires:	jquery-cookie
@@ -70,7 +69,7 @@ Requires:	webapps
 Requires:	webserver(access)
 Requires:	webserver(alias)
 Requires:	webserver(php)
-Suggests:	php-adldap >= 3.3.1
+Suggests:	php-adldap >= 4.0.4
 Suggests:	php-gd
 Obsoletes:	dokuwiki-plugin-jquery
 Conflicts:	dokuwiki-plugin-icalevents < 20120909
@@ -133,9 +132,11 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %if 0%{?snap:1}
 mv *-dokuwiki-*/* .
 test -e VERSION || echo %{subver}-git > VERSION
-install -d data/pages/playground
-touch data/pages/playground/playground.txt
 %endif
+install -d data/pages/playground
+test -e data/pages/playground/playground.txt || \
+echo '====== PlayGround ======' >  data/pages/playground/playground.txt
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -190,9 +191,8 @@ find -name _dummy | xargs %{__rm}
 %{__rm} -r inc/phpseclib
 
 # flash source on git tarballs
-rm -rf lib/_fla
 rm -rf lib/plugins/testing
-rm -rf lib/plugins/config/_test
+rm -rf lib/plugins/*/_test
 
 # use system packages
 %{__rm} lib/scripts/jquery/update.sh
@@ -237,6 +237,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/plugins.local.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/local.protected.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/mime.local.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/smileys.local.conf
+touch $RPM_BUILD_ROOT%{_sysconfdir}/userscript.js
 touch $RPM_BUILD_ROOT%{_sysconfdir}/userstyle.css
 
 ln $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/{dokubug,bug}.gif
@@ -332,6 +333,7 @@ exit 0
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.protected.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.local.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/smileys.local.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/userscript.js
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/userstyle.css
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/users.auth.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql.conf.php
@@ -358,10 +360,11 @@ exit 0
 %{_appdir}/index.php
 %dir %{_appdir}/bin
 %attr(755,root,root) %{_appdir}/bin/dwpage.php
+%attr(755,root,root) %{_appdir}/bin/gittool.php
 %attr(755,root,root) %{_appdir}/bin/indexer.php
 %attr(755,root,root) %{_appdir}/bin/render.php
-%attr(755,root,root) %{_appdir}/bin/wantedpages.php
 %attr(755,root,root) %{_appdir}/bin/striplangs.php
+%attr(755,root,root) %{_appdir}/bin/wantedpages.php
 
 %dir %{_appdir}/inc
 %{_appdir}/inc/*.php
@@ -372,6 +375,7 @@ exit 0
 # allow plugins dir permission change to allow installation of plugins from admin
 # however does not work with rpm 4.5
 %dir %config %verify(not group mode) %{_appdir}/lib/plugins
+%{_appdir}/lib/plugins/*.php
 %dir %{_appdir}/lib/plugins/acl
 %{_appdir}/lib/plugins/acl/*.*
 %{_appdir}/lib/plugins/acl/pix
@@ -398,9 +402,10 @@ exit 0
 %{_appdir}/lib/plugins/config/*.*
 %{_appdir}/lib/plugins/config/images
 %{_appdir}/lib/plugins/config/settings
-%dir %{_appdir}/lib/plugins/plugin
-%{_appdir}/lib/plugins/plugin/*.*
-%{_appdir}/lib/plugins/plugin/classes
+%dir %{_appdir}/lib/plugins/extension
+%{_appdir}/lib/plugins/extension/*.*
+%{_appdir}/lib/plugins/extension/helper
+%{_appdir}/lib/plugins/extension/images
 %dir %{_appdir}/lib/plugins/revert
 %{_appdir}/lib/plugins/revert/*.*
 %dir %{_appdir}/lib/plugins/safefnrecode
@@ -412,7 +417,6 @@ exit 0
 %{_appdir}/lib/plugins/info/*.*
 %dir %{_appdir}/lib/plugins/popularity
 %{_appdir}/lib/plugins/popularity/*.*
-%{_appdir}/lib/plugins/*.php
 
 %{_appdir}/lib/images
 %{_appdir}/lib/scripts