[packages/dokuwiki/DEVEL] packaging update
glen
glen at pld-linux.org
Sat Apr 13 16:59:35 CEST 2013
commit abd065b9acdfe4fd383fae9ce3b9dc06f16ce31e
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Mar 8 12:51:21 2013 +0200
packaging update
dokuwiki-config.patch | 2 +-
dokuwiki.spec | 37 +++++++++++++++++++++++++++++--------
2 files changed, 30 insertions(+), 9 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index a413588..fcffbc2 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -8,7 +8,7 @@ Summary: PHP-based Wiki webapplication
Summary(pl.UTF-8): Aplikacja WWW Wiki oparta na PHP
Name: dokuwiki
Version: %{ver}
-Release: 0.3
+Release: 0.4
License: GPL v2
Group: Applications/WWW
#Source0: http://www.splitbrain.org/_media/projects/dokuwiki/%{name}-%{subver}.tgz
@@ -180,6 +180,15 @@ rm -rf lib/_fla
rm -rf lib/plugins/testing
rm -rf lib/plugins/config/_test
+# use system packages
+%{__rm} lib/scripts/jquery/update.sh
+#%{__rm} lib/scripts/jquery/jquery-ui.js
+#%{__rm} lib/scripts/jquery/jquery-ui.min.js
+%{__rm} lib/scripts/jquery/jquery.cookie.js
+#%{__rm} lib/scripts/jquery/jquery.js
+#%{__rm} lib/scripts/jquery/jquery.min.js
+#%{__rm} -r lib/scripts/jquery/jquery-ui-theme
+
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -350,6 +359,25 @@ exit 0
%dir %{_appdir}/lib/plugins/acl
%{_appdir}/lib/plugins/acl/*.*
%{_appdir}/lib/plugins/acl/pix
+%dir %{_appdir}/lib/plugins/authad
+%{_appdir}/lib/plugins/authad/*.php
+%{_appdir}/lib/plugins/authad/*.txt
+%{_appdir}/lib/plugins/authad/conf
+%dir %{_appdir}/lib/plugins/authldap
+%{_appdir}/lib/plugins/authldap/*.php
+%{_appdir}/lib/plugins/authldap/*.txt
+%{_appdir}/lib/plugins/authldap/conf
+%dir %{_appdir}/lib/plugins/authmysql
+%{_appdir}/lib/plugins/authmysql/*.php
+%{_appdir}/lib/plugins/authmysql/*.txt
+%{_appdir}/lib/plugins/authmysql/conf
+%{_appdir}/lib/plugins/authpgsql/*.php
+%{_appdir}/lib/plugins/authpgsql/conf
+%{_appdir}/lib/plugins/authpgsql/*.txt
+%dir %{_appdir}/lib/plugins/authpgsql
+%dir %{_appdir}/lib/plugins/authplain
+%{_appdir}/lib/plugins/authplain/*.php
+%{_appdir}/lib/plugins/authplain/*.txt
%dir %{_appdir}/lib/plugins/config
%{_appdir}/lib/plugins/config/*.*
%{_appdir}/lib/plugins/config/images
@@ -370,13 +398,6 @@ exit 0
%{_appdir}/lib/plugins/popularity/*.*
%{_appdir}/lib/plugins/*.php
-
-%{_appdir}/lib/plugins/authad
-%{_appdir}/lib/plugins/authldap
-%{_appdir}/lib/plugins/authmysql
-%{_appdir}/lib/plugins/authpgsql
-%{_appdir}/lib/plugins/authplain
-
%{_appdir}/lib/images
%{_appdir}/lib/scripts
%{_appdir}/lib/styles
diff --git a/dokuwiki-config.patch b/dokuwiki-config.patch
index 61b1555..d34ea00 100644
--- a/dokuwiki-config.patch
+++ b/dokuwiki-config.patch
@@ -28,7 +28,7 @@
'2012-01-25' => '72c083c73608fc43c586901fd5dabb74',
'2012-09-10' => 'eb0b3fc90056fbc12bac6f49f7764df3',
- '2013-04-06' => '7b62b75245f57f122d3e0f8ed7989623',
-+ '2013-04-06' => 'asdf',
++ '2013-04-06' => '3a8e2c95eae3b9ec9af1f0e08f15e993',
);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki.git/commitdiff/abd065b9acdfe4fd383fae9ce3b9dc06f16ce31e
More information about the pld-cvs-commit
mailing list