packages: dokuwiki/dokuwiki.spec - obsoletes jquery plugin - package conf/p...

[glen]

Author: glen                         Date: Fri Jan  6 09:26:41 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- obsoletes jquery plugin
- package conf/plugins.local.php

---- Files affected:
packages/dokuwiki:
   dokuwiki.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.100 packages/dokuwiki/dokuwiki.spec:1.101
--- packages/dokuwiki/dokuwiki.spec:1.100	Thu Nov 24 20:59:52 2011
+++ packages/dokuwiki/dokuwiki.spec	Fri Jan  6 10:26:36 2012
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Aplikacja WWW Wiki oparta na PHP
 Name:		dokuwiki
 Version:	%{ver}
-Release:	0.3
+Release:	0.5
 License:	GPL v2
 Group:		Applications/WWW
 #Source0:	https://github.com/splitbrain/dokuwiki/tarball/master#/%{name}.tgz
@@ -64,6 +64,7 @@
 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
@@ -145,6 +146,8 @@
 
 # we just don't package deleted files, so these get removed automatically on rpm upgrades
 %{__rm} data/deleted.files
+# source for security.png
+%{__rm} data/security.xcf
 
 # use system geshi package
 %{__rm} inc/geshi.php
@@ -190,6 +193,7 @@
 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
@@ -220,13 +224,15 @@
 
 %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
 
@@ -262,7 +268,7 @@
 %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
@@ -276,11 +282,12 @@
 %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
@@ -379,6 +386,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2012/01/06 09:26:36  glen
+- obsoletes jquery plugin
+- package conf/plugins.local.php
+
 Revision 1.100  2011/11/24 19:59:52  glen
 - install speedup via hardlinks; cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.100&r2=1.101&f=u