[packages/dokuwiki: 7/8] up to 2013-12-08 "Binky" release

glen glen at pld-linux.org
Thu Dec 19 11:02:55 CET 2013


commit 8b67816689f2934c21cb368625f14610f0f7454c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Dec 19 11:52:16 2013 +0200

    up to 2013-12-08 "Binky" release

 dokuwiki-config.patch |  8 ++++----
 dokuwiki.spec         | 13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index a0ab4ca..ee10bc4 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,20 +1,18 @@
-%define		subver	2013-10-28
+%define		subver	2013-12-08
 %define		ver		%(echo %{subver} | tr -d -)
 #define		snap	1
-%define		rc_	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.3
+Release:	1
 License:	GPL v2
 Group:		Applications/WWW
-#Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-Source0:	http://download.dokuwiki.org/src/dokuwiki/%{name}-rc%{subver}.tgz
-# Source0-md5:	f476b54a3679d35cdd8746db57c9c6a3
-#Source0:	http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
+Source0:	http://download.dokuwiki.org/src/dokuwiki/%{name}-%{subver}.tgz
+# Source0-md5:	620b7fed511e643ad05ad13207baa502
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	http://glen.alkohol.ee/pld/jude.png
@@ -193,6 +191,7 @@ find -name _dummy | xargs %{__rm}
 rm -rf lib/_fla
 rm -rf lib/plugins/testing
 rm -rf lib/plugins/config/_test
+rm -rf lib/plugins/usermanager/_test
 
 # use system packages
 %{__rm} lib/scripts/jquery/update.sh
diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index aa1de99..be6ae2f 100644
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -21,14 +21,14 @@
  $conf['userewrite']  = 0;                //this makes nice URLs: 0: off 1: .htaccess 2: internal
  $conf['useslash']    = 0;                //use slash instead of colon? only when rewrite is on
  $conf['sepchar']     = '_';              //word separator character in page names; may be a
---- dokuwiki-rc2013-10-28/install.php~	2013-11-13 22:24:06.193631633 +0200
-+++ dokuwiki-rc2013-10-28/install.php	2013-11-13 22:24:34.423188022 +0200
+--- dokuwiki-2013-12-08/install.php~	2013-12-18 23:05:54.321131662 +0200
++++ dokuwiki-2013-12-08/install.php	2013-12-18 23:06:30.110557953 +0200
 @@ -58,7 +58,7 @@
      '2012-01-25'   => '72c083c73608fc43c586901fd5dabb74',
      '2012-09-10'   => 'eb0b3fc90056fbc12bac6f49f7764df3',
      '2013-05-10'   => '7b62b75245f57f122d3e0f8ed7989623',
--    '2013-10-28'   => '263c76af309fbf083867c18a34ff5214',
-+    '2013-10-28'   => '5527d61a24b4feb0ade5a952848108fb',
+-    '2013-12-08'   => '263c76af309fbf083867c18a34ff5214',
++    '2013-12-08'   => '5527d61a24b4feb0ade5a952848108fb',
  );
  
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/79207c2d683efc1381ba2134b3024721845b1ffd



More information about the pld-cvs-commit mailing list