X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dokuwiki.spec;h=25da9a73312a5e1ba4847b85eb650b22b1e3dafb;hb=d056ce8638d172fd24f5098b1b41f603e86503f6;hp=b931526b8a8d0e5a8ab85832aee99d66e600b5c9;hpb=26e4ef5bc397ac7a90d5534f6ac6b64bf03450b1;p=packages%2Fdokuwiki.git

diff --git a/dokuwiki.spec b/dokuwiki.spec
index b931526..25da9a7 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,20 +1,16 @@
-# TODO
-# - remove %config from lang files: https://github.com/splitbrain/dokuwiki/commit/e6cecb0872ef457f44529edbc736aba3dc3ac258
-%define		subver	2011-11-10
+%define		subver	2012-01-25
 %define		ver		%(echo %{subver} | tr -d -)
-%define		php_min_version 5.1.2
+%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:	2
 License:	GPL v2
 Group:		Applications/WWW
-#Source0:	https://github.com/splitbrain/dokuwiki/tarball/master#/%{name}.tgz
-#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:	6faf2f586cadbfc23d3b53745a00a482
+Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5:	da7ec30fc51c48035adc48dc0535a317
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	http://glen.alkohol.ee/pld/jude.png
@@ -49,6 +45,8 @@ 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
 BuildRequires:	fslint
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
@@ -64,6 +62,7 @@ Requires:	webserver(alias)
 Requires:	webserver(php)
 Suggests:	php-adldap >= 3.3.1
 Suggests:	php-gd
+Obsoletes:	dokuwiki-plugin-jquery
 # can use gz compression to store attic pages
 Suggests:	php-zlib
 BuildArch:	noarch
@@ -118,7 +117,7 @@ po pierwszej instalacji. Potem należy go odinstalować, jako że
 pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 
 %prep
-%setup -q -n %{name}-rc%{subver}
+%setup -q -n %{name}-%{subver}
 %patch0 -p1
 %patch3 -p1
 %patch4 -p1
@@ -136,17 +135,18 @@ pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %patch66 -p1
 
 find -name _dummy | xargs rm
-rm lib/index.html lib/plugins/index.html inc/lang/.htaccess
+%{__rm} lib/index.html lib/plugins/index.html inc/lang/.htaccess
 
 # we just don't package deleted files, so these get removed automatically on rpm upgrades
 %{__rm} data/deleted.files
-
-# safe file
-#mv conf/words.aspell{.dist,}
+# source for security.png
+%{__rm} data/security.xcf
 
 # use system geshi package
 %{__rm} inc/geshi.php
@@ -175,20 +175,24 @@ fi
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{lang,plugin_lang},%{_localstatedir},%{_appdir}/{bin,inc,lib}}
 
-cp -a *.php $RPM_BUILD_ROOT%{_appdir}
-cp -p VERSION $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}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+# 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 %{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}/license.local.php
+touch $RPM_BUILD_ROOT%{_sysconfdir}/plugins.local.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/local.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/local.protected.php
 touch $RPM_BUILD_ROOT%{_sysconfdir}/mime.local.conf
@@ -196,17 +200,17 @@ 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/interwiki/eventum.gif
-cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/cacti.gif
-cp -a %{SOURCE8} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/nagios.gif
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/skype.png
-cp -a %{SOURCE9} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/trac.png
-cp -a %{SOURCE10} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/pld.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 %{SOURCE5} $RPM_BUILD_ROOT%{_appdir}/lib/images/interwiki/skype.png
+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 -a %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/jude.png
-cp -a %{SOURCE11} $RPM_BUILD_ROOT%{_appdir}/lib/images/fileicons/asta.png
+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 -a %{SOURCE6} $RPM_BUILD_ROOT%{_appdir}/lib/tpl/default/images/button-pld.png
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_appdir}/lib/tpl/default/images/button-pld.png
 
 # hardlink identical icons.
 findup -m $RPM_BUILD_ROOT
@@ -219,13 +223,15 @@ 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
 
@@ -261,7 +267,7 @@ 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
@@ -275,11 +281,12 @@ exit 0
 %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}/license.local.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size mode) %{_sysconfdir}/local.php
 %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 mode) %{_sysconfdir}/plugins.local.php
 %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}/userstyle.css
-%attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local.php
 
 # use local.php, local.protected.php, etc for local changes
 %attr(640,root,http) %config %verify(not md5 mtime size) %{_sysconfdir}/acronyms.conf
@@ -366,7 +373,6 @@ exit 0
 %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
-%attr(660,root,http) %config(noreplace,missingok) %verify(not md5 mtime size) %{_localstatedir}/security.xcf
 
 %files setup
 %defattr(644,root,root,755)