From: Elan Ruusamäe <glen@delfi.ee>
Date: Sun, 23 Sep 2012 19:11:34 +0000 (+0300)
Subject: up to 2012-09-23 snap
X-Git-Tag: auto/th/dokuwiki-20121013-1~4
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=eabe501672d0d97d512a5a0f4b7b77a6c660454f;p=packages%2Fdokuwiki.git

up to 2012-09-23 snap

- contains important html mail xss fix
- fixes to userstyle.css not reloaded
- drop lib/images/index.html from packaging
---

diff --git a/dokuwiki.spec b/dokuwiki.spec
index e570138..d249411 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -1,18 +1,18 @@
-%define		subver	2012-09-10
+%define		subver	2012-09-23
 %define		ver		%(echo %{subver} | tr -d -)
-#define		snap	1
+%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:	1
+Release:	0.1
 License:	GPL v2
 Group:		Applications/WWW
-Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
-# Source0-md5:	603aa49cbf046b7431467e4dcefae17f
-#Source0:	http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
+#Source0:	http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
+Source0:	http://github.com/splitbrain/dokuwiki/tarball/master/%{name}-%{subver}.tgz
+# Source0-md5:	4cc5ef8c103f069d65a284384970837a
 Source1:	%{name}-apache.conf
 Source2:	%{name}-lighttpd.conf
 Source3:	http://glen.alkohol.ee/pld/jude.png
@@ -156,7 +156,7 @@ mv conf/users.auth.php{.dist,}
 mv conf/mysql.conf.php{.example,}
 
 find -name _dummy | xargs rm
-%{__rm} lib/index.html lib/plugins/index.html inc/lang/.htaccess
+%{__rm} lib/index.html lib/plugins/index.html lib/images/index.html inc/lang/.htaccess
 
 # we just don't package deleted files, these get removed automatically on rpm upgrades
 %{__rm} data/deleted.files