-%define subver 2012-07-30
+%define subver 2014-09-29d
%define ver %(echo %{subver} | tr -d -)
-%define snap 1
+#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: 0.12
+Release: 1
License: GPL v2
Group: Applications/WWW
-#Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-Source0: http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
-# Source0-md5: fbe020fa8a4929d3376db23d195548a8
+# 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
Patch66: %{name}-config.patch
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
Patch8: %{name}-notify-respect-minor.patch
Patch10: %{name}-mailtext.patch
Patch11: %{name}-notifyns.patch
-Patch12: %{name}-mailthreads.patch
Patch14: interwiki-outputonly.patch
Patch15: simplepie.patch
Patch19: pld-branding.patch
Patch20: fixprivilegeescalationbug.diff
Patch21: task-1821.patch
Patch22: adldap.patch
-Patch23: backlink-rightside.patch
Patch24: more-buttons.patch
-URL: http://www.dokuwiki.org/dokuwiki
+Patch25: system-phpseclib.patch
+Patch26: system-lessphp.patch
+URL: https://www.dokuwiki.org/
BuildRequires: fslint
BuildRequires: rpm-php-pearprov >= 4.4.2-11
-BuildRequires: rpmbuild(macros) >= 1.520
-Requires: jquery >= 1.6
+BuildRequires: rpmbuild(macros) >= 1.693
+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: lessphp >= 0.3.9
Requires: php(core) >= %{php_min_version}
Requires: php(session)
Requires: php(xml)
Requires: php-geshi >= 1.0.7.19
+Requires: php-seclib >= 0.3.5
Requires: php-simplepie >= 1.0.1
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
# can use gz compression to store attic pages
Suggests: php-zlib
BuildArch: noarch
%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
-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
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch8 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
%patch14 -p1
%patch15 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
-%patch23 -p1
%patch24 -p1
+%patch25 -p1
+%patch26 -p1
%patch66 -p1
mv conf/users.auth.php{.dist,}
mv conf/mysql.conf.php{.example,}
-find -name _dummy | xargs rm
-%{__rm} lib/index.html lib/plugins/index.html inc/lang/.htaccess
+find -name _dummy | xargs %{__rm}
+%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html
+%{__rm} {conf,inc,bin,data,inc/lang}/.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
+# use system lessphp package
+%{__rm} inc/lessc.inc.php
+
+# use system lib
+%{__rm} -r inc/phpseclib
+
# flash source on git tarballs
-rm -rf lib/_fla
rm -rf lib/plugins/testing
+rm -rf lib/plugins/*/_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
cp -a$l lib/* $RPM_BUILD_ROOT%{_appdir}/lib
cp -a$l conf/* $RPM_BUILD_ROOT%{_sysconfdir}
cp -a$l data/* $RPM_BUILD_ROOT%{_localstatedir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
touch $RPM_BUILD_ROOT%{_sysconfdir}/acronyms.local.conf
touch $RPM_BUILD_ROOT%{_sysconfdir}/entities.local.conf
touch $RPM_BUILD_ROOT%{_sysconfdir}/interwiki.local.conf
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
cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/jude.png
cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/asta.png
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_appdir}/lib/tpl/default/images/button-pld.png
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_appdir}/lib/tpl/dokuwiki/images/button-pld.png
# hardlink identical icons.
findup -m $RPM_BUILD_ROOT
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+
# find locales
%find_lang %{name}.lang
%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
%{_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
%{_appdir}/inc/preload.php.dist
-%{_appdir}/inc/auth
%{_appdir}/inc/parser
%dir %{_appdir}/lib
-%dir %{_appdir}/lib/plugins
+# 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
+%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
%{_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
%{_appdir}/lib/plugins/info/*.*
%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
projects / packages / dokuwiki.git / blobdiff