-%define subver 2012-09-10
+%define subver 2013-05-10
%define ver %(echo %{subver} | tr -d -)
#define snap 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: 1
+Release: 0.9
License: GPL v2
Group: Applications/WWW
Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: 603aa49cbf046b7431467e4dcefae17f
+# Source0-md5: 9cb5bb79c0445df849845b586e872677
+#Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
#Source0: http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Patch0: %{name}-paths.patch
Patch1: system-jquery.patch
Patch2: style-width.patch
+Patch3: undeprecate.patch
Patch4: %{name}-geshi.patch
Patch5: %{name}-http_auth-option.patch
Patch6: %{name}-nice_exit.patch
Patch22: adldap.patch
Patch23: backlink-rightside.patch
Patch24: more-buttons.patch
-URL: http://www.dokuwiki.org/dokuwiki
+URL: https://www.dokuwiki.org/
BuildRequires: fslint
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.520
-Requires: jquery >= 1.6
+Requires: jquery >= 1.8
+#Requires: jquery >= 1.9.1
Requires: jquery-cookie
-Requires: jquery-ui
+#Requires: jquery-migrate
+#Requires: jquery-ui >= 1.10.2
+Requires: jquery-ui >= 1.8
Requires: php(core) >= %{php_min_version}
Requires: php(session)
Requires: php(xml)
%define find_lang %{_usrlibrpm}/dokuwiki-find-lang.sh %{buildroot}
# bad depsolver
-%define _noautopear pear(/usr/share/php/geshi.php) pear(/usr/share/php/adLDAP.php)
+%define _noautopear pear./usr/share/php/geshi.php pear./usr/share/php/adLDAP.php
# exclude optional php dependencies
%define _noautophp php-bzip2 php-bcmath php-zip php-date php-ftp php-hash php-ldap php-mbstring php-mysql php-pgsql php-tokenizer
pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
%prep
-%setup -q -n %{name}-%{subver} %{?snap:-c}
+%setup -q -n %{name}-%{?rc_:rc}%{subver} %{?snap:-c}
%if 0%{?snap:1}
mv *-dokuwiki-*/* .
test -e VERSION || echo %{subver}-git > VERSION
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch8 -p1
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+#patch11 -p1 UPDATE
+#%patch12 -p1 OUTDATED?
%patch14 -p1
%patch15 -p1
%patch19 -p1
%patch20 -p1
-%patch21 -p1
+#%%patch21 -p1 CHECKME
%patch22 -p1
%patch23 -p1
%patch24 -p1
mv conf/mysql.conf.php{.example,}
find -name _dummy | xargs rm
-%{__rm} lib/index.html lib/plugins/index.html inc/lang/.htaccess
+%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html inc/lang/.htaccess conf/.htaccess
# we just don't package deleted files, these get removed automatically on rpm upgrades
%{__rm} data/deleted.files
%{__rm} -r inc/geshi
# use system adldap package
-%{__rm} inc/adLDAP.php
+%{__rm} -r lib/plugins/authad/adLDAP
# use system simplepie package
%{__rm} inc/SimplePie.php
# flash source on git tarballs
rm -rf lib/_fla
rm -rf lib/plugins/testing
+rm -rf lib/plugins/config/_test
+
+# use system packages
+%{__rm} lib/scripts/jquery/update.sh
+%{__rm} lib/scripts/jquery/jquery-ui.js
+%{__rm} lib/scripts/jquery/jquery-ui.min.js
+%{__rm} lib/scripts/jquery/jquery.cookie.js
+%{__rm} lib/scripts/jquery/jquery.js
+%{__rm} lib/scripts/jquery/jquery.min.js
+%{__rm} lib/scripts/jquery/jquery-migrate.js
+%{__rm} lib/scripts/jquery/jquery-migrate.min.js
+%{__rm} -r lib/scripts/jquery/jquery-ui-theme
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
%dir %{_appdir}/inc
%{_appdir}/inc/*.php
%{_appdir}/inc/preload.php.dist
-%{_appdir}/inc/auth
%{_appdir}/inc/parser
%dir %{_appdir}/lib
%dir %{_appdir}/lib/plugins/acl
%{_appdir}/lib/plugins/acl/*.*
%{_appdir}/lib/plugins/acl/pix
+%dir %{_appdir}/lib/plugins/authad
+%{_appdir}/lib/plugins/authad/*.php
+%{_appdir}/lib/plugins/authad/*.txt
+%{_appdir}/lib/plugins/authad/conf
+%dir %{_appdir}/lib/plugins/authldap
+%{_appdir}/lib/plugins/authldap/*.php
+%{_appdir}/lib/plugins/authldap/*.txt
+%{_appdir}/lib/plugins/authldap/conf
+%dir %{_appdir}/lib/plugins/authmysql
+%{_appdir}/lib/plugins/authmysql/*.php
+%{_appdir}/lib/plugins/authmysql/*.txt
+%{_appdir}/lib/plugins/authmysql/conf
+%{_appdir}/lib/plugins/authpgsql/*.php
+%{_appdir}/lib/plugins/authpgsql/conf
+%{_appdir}/lib/plugins/authpgsql/*.txt
+%dir %{_appdir}/lib/plugins/authpgsql
+%dir %{_appdir}/lib/plugins/authplain
+%{_appdir}/lib/plugins/authplain/*.php
+%{_appdir}/lib/plugins/authplain/*.txt
%dir %{_appdir}/lib/plugins/config
%{_appdir}/lib/plugins/config/*.*
%{_appdir}/lib/plugins/config/images
%dir %{_appdir}/lib/plugins/popularity
%{_appdir}/lib/plugins/popularity/*.*
%{_appdir}/lib/plugins/*.php
+
%{_appdir}/lib/images
%{_appdir}/lib/scripts
%{_appdir}/lib/styles
%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}/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/wiki/welcome.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}/security.png