packages: dokuwiki/dokuwiki-config.patch, dokuwiki/dokuwiki.spec - up to 20...
glen
glen at pld-linux.org
Wed Nov 23 21:27:48 CET 2011
Author: glen Date: Wed Nov 23 20:27:48 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2011-11-10 rc
---- Files affected:
packages/dokuwiki:
dokuwiki-config.patch (1.16 -> 1.17) , dokuwiki.spec (1.96 -> 1.97)
---- Diffs:
================================================================
Index: packages/dokuwiki/dokuwiki-config.patch
diff -u packages/dokuwiki/dokuwiki-config.patch:1.16 packages/dokuwiki/dokuwiki-config.patch:1.17
--- packages/dokuwiki/dokuwiki-config.patch:1.16 Wed Jun 8 10:38:53 2011
+++ packages/dokuwiki/dokuwiki-config.patch Wed Nov 23 21:27:43 2011
@@ -19,15 +19,14 @@
$conf['fullpath'] = 0; //show full path of the document or relative to datadir only? 0|1
$conf['recent'] = 20; //how many entries to show in recent
$conf['breadcrumbs'] = 10; //how many recent visited pages to show
-diff -dur -x '*.orig' dokuwiki-2011-05-25.orig/install.php dokuwiki-2011-05-25/install.php
---- dokuwiki-2011-05-25.orig/install.php 2011-06-08 10:34:21.000000000 +0200
-+++ dokuwiki-2011-05-25/install.php 2011-06-08 10:36:30.000000000 +0200
-@@ -48,7 +48,7 @@
- '2009-02-14' => 'ec8c04210732a14fdfce0f7f6eead865',
+--- dokuwiki-rc2011-11-10/install.php~ 2011-11-21 12:43:24.000000000 +0200
++++ dokuwiki-rc2011-11-10/install.php 2011-11-21 12:43:49.050477388 +0200
+@@ -49,7 +49,7 @@
'2009-12-25' => '993c4b2b385643efe5abf8e7010e11f4',
'2010-11-07' => '7921d48195f4db21b8ead6d9bea801b8',
-- '2011-05-25' => '4241865472edb6fa14a1227721008072',
-+ '2011-05-25pld' => '9e9496204af31a3fe6b3b97d58d7c58f',
+ '2011-05-25' => '4241865472edb6fa14a1227721008072',
+- '2011-11-10' => 'b46ff19a7587966ac4df61cbab1b8b31',
++ '2011-11-10pld' => '551f1a079e8e83981789b951bd9db29c',
);
================================================================
Index: packages/dokuwiki/dokuwiki.spec
diff -u packages/dokuwiki/dokuwiki.spec:1.96 packages/dokuwiki/dokuwiki.spec:1.97
--- packages/dokuwiki/dokuwiki.spec:1.96 Sun Oct 2 00:47:47 2011
+++ packages/dokuwiki/dokuwiki.spec Wed Nov 23 21:27:43 2011
@@ -1,7 +1,7 @@
# $Revision$, $Date$
# TODO
# - remove %config from lang files: https://github.com/splitbrain/dokuwiki/commit/e6cecb0872ef457f44529edbc736aba3dc3ac258
-%define subver 2011-05-25a
+%define subver 2011-11-10
%define ver %(echo %{subver} | tr -d -)
%define php_min_version 5.1.2
%include /usr/lib/rpm/macros.php
@@ -9,13 +9,13 @@
Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
Name: dokuwiki
Version: %{ver}
-Release: 1
+Release: 0.2
License: GPL v2
Group: Applications/WWW
-#Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
#Source0: https://github.com/splitbrain/dokuwiki/tarball/master#/%{name}.tgz
-Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5: 6452eff54afa35e031e15fec9a737dd1
+#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
Source1: %{name}-apache.conf
Source2: %{name}-lighttpd.conf
Source3: http://glen.alkohol.ee/pld/jude.png
@@ -119,7 +119,7 @@
pozostawienie plików instalacyjnych mogłoby być niebezpieczne.
%prep
-%setup -q -n %{name}-%{subver}
+%setup -q -n %{name}-rc%{subver}
%patch0 -p1
%patch3 -p1
%patch4 -p1
@@ -215,16 +215,6 @@
# find locales
%find_lang %{name}.lang
-# make inc/lang/en/edit.txt as %config
-%{__sed} -i -e '
-/%%lang([^)]\+) \/usr\/share\/dokuwiki\/inc\/lang\/[^/]\+/{
- # make entry as %%dir
- s/^/%%dir /; p
-
- # add files inside the %dir
- s/^%%dir /%%config(noreplace) %%verify(not md5 mtime size) /; s/$/\/*.*/
-}' %{name}.lang
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -280,7 +270,6 @@
%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}/words.aspell
%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}/acronyms.local.conf
@@ -293,15 +282,17 @@
%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
+# 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}/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
+
# samples. perhaps move to %doc instead?
%attr(640,root,http) %{_sysconfdir}/mysql.conf.php.example
%attr(640,root,http) %{_sysconfdir}/acl.auth.php.dist
@@ -362,12 +353,15 @@
%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/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
@@ -385,11 +379,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.97 2011/11/23 20:27:43 glen
+- up to 2011-11-10 rc
+
Revision 1.96 2011/10/01 22:47:47 adamg
- updated to 2011-05-25a
Revision 1.95 2011/07/25 10:10:10 glen
-
- package %{_sysconfdir}/{lang,plugin_lang}, see:
http://www.dokuwiki.org/localization#changing_localized_texts_in_your_installation
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki-config.patch?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki/dokuwiki.spec?r1=1.96&r2=1.97&f=u
More information about the pld-cvs-commit
mailing list