-%define subver 2009-02-06
-%define ver %(echo %{subver} | tr -d -)
+%define subver 2012-10-13
+%define ver %(echo %{subver} | tr -d -)
+#define snap 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.1
+Release: 3
License: GPL v2
Group: Applications/WWW
-#Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-rc%{subver}.tgz
-# Source0-md5: 6eeae1adfbd080636a22543c575a208e
+Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5: a910ebb2fcca13c0337ed672304c4ad4
+#Source0: http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
-Source3: %{name}-find-lang.sh
-Source4: jude.png
-# Source4-md5: 623344128960e18f86097dfee213ad4a
-Source5: eventum.gif
-# Source5-md5: cac3d0f82591a33eda2afa8ae5fe65cb
+Source3: http://glen.alkohol.ee/pld/jude.png
+# Source3-md5: 623344128960e18f86097dfee213ad4a
+Source4: eventum.gif
+Source6: pld_button.png
+# Source6-md5: 185afa921e81bd726b9f0f9f0909dc6e
+Source7: cacti.gif
+Source8: nagios.gif
+Source9: http://trac.edgewall.org/export/9404/trunk/doc/trac_icon_16x16.png
+# Source9-md5: 0c19ed35bf677f33f6bea14b3a8a2e10
+Source10: pld.gif
+Source11: http://glen.alkohol.ee/pld/astah.png
+# Source11-md5: b1c999e6988440c9e2af6a12e9a56451
+Source12: %{name}-httpd.conf
+Patch66: %{name}-config.patch
Patch0: %{name}-paths.patch
-Patch1: %{name}-config.patch
-Patch2: %{name}-mysqlauth.patch
-Patch3: %{name}-config-allow-require.patch
+Patch1: system-jquery.patch
+Patch2: style-width.patch
Patch4: %{name}-geshi.patch
Patch5: %{name}-http_auth-option.patch
Patch6: %{name}-nice_exit.patch
-Patch7: %{name}-mail-headerencodequotes.patch
Patch8: %{name}-notify-respect-minor.patch
-Patch9: %{name}-media-userinfo.patch
Patch10: %{name}-mailtext.patch
Patch11: %{name}-notifyns.patch
Patch12: %{name}-mailthreads.patch
-URL: http://wiki.splitbrain.org/wiki:dokuwiki
-BuildRequires: rpmbuild(macros) >= 1.268
-Requires: geshi >= 1.0.7.19
+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: 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-cookie
+Requires: jquery-ui
+Requires: php(core) >= %{php_min_version}
+Requires: php(session)
Requires: php(xml)
+Requires: php-geshi >= 1.0.7.19
+Requires: php-simplepie >= 1.0.1
Requires: webapps
Requires: webserver(access)
Requires: webserver(alias)
-Requires: webserver(php) >= 4.3.3
-Suggests: php(gd)
+Requires: webserver(php)
+Suggests: php-adldap >= 3.3.1
+Suggests: php-gd
+Obsoletes: dokuwiki-plugin-jquery
+Conflicts: apache-base < 2.4.0-1
+Conflicts: dokuwiki-plugin-icalevents < 20120909
# can use gz compression to store attic pages
-Suggests: php(zlib)
+Suggests: php-zlib
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir %{_webapps}/%{_webapp}
%define _appdir %{_datadir}/%{_webapp}
%define _localstatedir /var/lib/%{name}
+%define _cachedir /var/cache/%{name}
+%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
+
+# 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
+
+%define _noautoreq %{_noautophp} %{_noautopear}
%description
DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
%prep
-%setup -q -n %{name}-rc%{subver}
+%setup -q -n %{name}-%{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
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%patch8 -p1
-%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch14 -p1
+%patch15 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+
+%patch66 -p1
+
+# package as basenames, upgrade overwrite protected with .rpmnew
+mv conf/local.php{.dist,}
+mv conf/acl.auth.php{.dist,}
+mv conf/users.auth.php{.dist,}
+mv conf/mysql.conf.php{.example,}
find -name _dummy | xargs rm
-rm -f lib/index.html lib/plugins/index.html
+%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html inc/lang/.htaccess
-rm -f inc/lang/.htaccess
-# safe file
-mv conf/words.aspell{.dist,}
+# we just don't package deleted files, these get removed automatically on rpm upgrades
+%{__rm} data/deleted.files
+# source for security.png
+%{__rm} data/security.xcf
# use system geshi package
-rm -f inc/geshi.php
-rm -rf inc/geshi
+%{__rm} inc/geshi.php
+%{__rm} -r inc/geshi
+
+# use system adldap package
+%{__rm} inc/adLDAP.php
+
+# use system simplepie package
+%{__rm} inc/SimplePie.php
-# our plugins dir is not writable anyway, nothing to convert
-rm -rf lib/plugins/upgradeplugindirectory
+# flash source on git tarballs
+rm -rf lib/_fla
+rm -rf lib/plugins/testing
# cleanup backups after patching
-find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
+%build
+md5=$(md5sum -b conf/dokuwiki.php | awk '{print $1}')
+if ! grep $md5 install.php; then
+ : update %{name}-config.patch -- it is outdated
+ exit 1
+fi
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_localstatedir},%{_appdir}/{bin,inc,lib}}
-
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-cp -a bin/* $RPM_BUILD_ROOT%{_appdir}/bin
-cp -a inc/* $RPM_BUILD_ROOT%{_appdir}/inc
-cp -a lib/* $RPM_BUILD_ROOT%{_appdir}/lib
-cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a data/* $RPM_BUILD_ROOT%{_localstatedir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{lang,plugin_lang},%{_localstatedir},%{_cachedir},%{_appdir}/{bin,inc,lib}}
+
+# hardlink test
+cp -al VERSION $RPM_BUILD_ROOT%{_appdir} 2>/dev/null && l=l
+
+cp -a$l *.php $RPM_BUILD_ROOT%{_appdir}
+cp -p$l VERSION $RPM_BUILD_ROOT%{_appdir}
+cp -a$l bin/* $RPM_BUILD_ROOT%{_appdir}/bin
+cp -a$l inc/* $RPM_BUILD_ROOT%{_appdir}/inc
+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 %{SOURCE12} $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}/license.local.php
-touch $RPM_BUILD_ROOT%{_sysconfdir}/local.php
+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}/userstyle.css
ln $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/{dokubug,bug}.gif
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/eventum.gif
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/eventum.gif
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/cacti.gif
+cp -p %{SOURCE8} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/nagios.gif
+cp -p %{SOURCE9} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/trac.png
+cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/pld.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/dokuwiki/images/button-pld.png
+ln $RPM_BUILD_ROOT%{_appdir}/lib/tpl/{dokuwiki,default}/images/button-pld.png
+
+# hardlink identical icons.
+findup -m $RPM_BUILD_ROOT
# find locales
-sh %{SOURCE3} %{name}.lang
+%find_lang %{name}.lang
%clean
rm -rf $RPM_BUILD_ROOT
%post setup
chmod 770 %{_sysconfdir}
-chmod 660 %{_sysconfdir}/dokuwiki.php
+chmod 660 %{_sysconfdir}/local.php
+chmod 660 %{_sysconfdir}/plugins.local.php
%postun setup
if [ "$1" = "0" ]; then
if [ -f %{_sysconfdir}/dokuwiki.php ]; then
chmod 750 %{_sysconfdir}
- chmod 640 %{_sysconfdir}/dokuwiki.php
+ chmod 640 %{_sysconfdir}/local.php
+ chmod 640 %{_sysconfdir}/plugins.local.php
fi
fi
%triggerun -- apache1 < 1.3.37-3, apache1-base
%webapp_unregister apache %{_webapp}
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
%webapp_register httpd %{_webapp}
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
%webapp_unregister httpd %{_webapp}
%triggerin -- lighttpd
mv -f %{_appdir}/conf/* %{_sysconfdir}
rm -rf %{_appdir}/conf
fi
+if [ -d %{_localstatedir}/cache ]; then
+ rm -rf %{_localstatedir}/cache
+fi
exit 0
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc README
-%dir %attr(750,root,http) %{_sysconfdir}
+%dir %attr(750,root,http) %verify(not mode) %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}/lang
+%dir %attr(750,root,http) %{_sysconfdir}/plugin_lang
%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
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mediameta.php
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/msg
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/words.aspell
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugins.php
%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/scheme.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/acl.auth.php
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/acronyms.local.conf
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/entities.local.conf
%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/interwiki.local.conf
%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(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.php
+%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
+
+%attr(640,root,http) %config(noreplace) %verify(not md5 mode mtime size) %{_sysconfdir}/local.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mode mtime size) %{_sysconfdir}/plugins.local.php
-# use local.php,local.protected.php, etc for local changes
+# use local.php, local.protected.php, etc for local changes
%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/acronyms.conf
-%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/dokuwiki.php
%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/entities.conf
%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/interwiki.conf
-%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/license.php
%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/mime.conf
%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/smileys.conf
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/wordblock.conf
-# samples. perhaps move to %doc instead?
-%attr(640,root,http) %{_sysconfdir}/mysql.conf.php.example
-%attr(640,root,http) %{_sysconfdir}/acl.auth.php.dist
-%attr(640,root,http) %{_sysconfdir}/wordblock.conf
-%attr(640,root,http) %{_sysconfdir}/local.php.dist
-%attr(640,root,http) %{_sysconfdir}/users.auth.php.dist
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/dokuwiki.php
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/license.php
+%attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/plugins.required.php
%dir %{_appdir}
+%{_appdir}/VERSION
%{_appdir}/doku.php
%{_appdir}/feed.php
%{_appdir}/index.php
%dir %{_appdir}/bin
%attr(755,root,root) %{_appdir}/bin/dwpage.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
%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
%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/images
%{_appdir}/lib/plugins/config/settings
%dir %{_appdir}/lib/plugins/plugin
%{_appdir}/lib/plugins/plugin/*.*
+%{_appdir}/lib/plugins/plugin/classes
%dir %{_appdir}/lib/plugins/revert
%{_appdir}/lib/plugins/revert/*.*
+%dir %{_appdir}/lib/plugins/safefnrecode
+%{_appdir}/lib/plugins/safefnrecode/*.*
%dir %{_appdir}/lib/plugins/usermanager
%{_appdir}/lib/plugins/usermanager/*.*
%{_appdir}/lib/plugins/usermanager/images
-%{_appdir}/lib/plugins/info
+%dir %{_appdir}/lib/plugins/info
+%{_appdir}/lib/plugins/info/*.*
%dir %{_appdir}/lib/plugins/popularity
%{_appdir}/lib/plugins/popularity/*.*
%{_appdir}/lib/plugins/*.php
%dir %attr(770,root,http) %{_localstatedir}
%dir %attr(770,root,http) %{_localstatedir}/attic
-%dir %attr(770,root,http) %{_localstatedir}/cache
%dir %attr(770,root,http) %{_localstatedir}/index
%dir %attr(770,root,http) %{_localstatedir}/locks
%dir %attr(770,root,http) %{_localstatedir}/media
+%dir %attr(770,root,http) %{_localstatedir}/media_attic
+%dir %attr(770,root,http) %{_localstatedir}/media_meta
%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/wiki
%dir %attr(770,root,http) %{_localstatedir}/pages/playground
+%dir %attr(770,root,http) %{_localstatedir}/pages/wiki
%dir %attr(770,root,http) %{_localstatedir}/tmp
+
%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/playground/playground.txt
+%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/security.png
+
+%dir %attr(770,root,http) %{_cachedir}
%files setup
%defattr(644,root,root,755)