[packages/dokuwiki-plugin-note] attempt to fix toc conflict
glen
glen at pld-linux.org
Mon Aug 24 08:47:13 CEST 2015
commit 7e5d1c619e43872ef27acb65ea0e7260e6d477f4
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Aug 24 09:46:46 2015 +0300
attempt to fix toc conflict
https://www.dokuwiki.org/plugin:note#conflict_with_toc
dokuwiki-plugin-note.spec | 4 +++-
toc-fix.patch | 14 ++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/dokuwiki-plugin-note.spec b/dokuwiki-plugin-note.spec
index ee7e9ed..28b0d2a 100644
--- a/dokuwiki-plugin-note.spec
+++ b/dokuwiki-plugin-note.spec
@@ -2,11 +2,12 @@
Summary: DokuWiki note plugin
Name: dokuwiki-plugin-%{plugin}
Version: 20090615
-Release: 1
+Release: 2
License: GPL v2
Group: Applications/WWW
Source0: http://gauret.free.fr/fichiers/dokuwiki/dokuwiki-%{plugin}-%{version}.tgz
# Source0-md5: 9121176dcb0c83ebd1d9008e949191ec
+Patch0: toc-fix.patch
URL: http://www.dokuwiki.org/plugin:note
BuildRequires: rpmbuild(macros) >= 1.520
Requires: dokuwiki >= 20090214
@@ -24,6 +25,7 @@ This plugin allows you to create nice notes in your DokuWiki pages.
%setup -qc
mv %{plugin}/* .
rm %{plugin}/.gitignore
+%patch0 -p1
version=$(awk '/date/{print $2}' info.txt)
if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
diff --git a/toc-fix.patch b/toc-fix.patch
new file mode 100644
index 0000000..5cdb034
--- /dev/null
+++ b/toc-fix.patch
@@ -0,0 +1,14 @@
+--- note/style.css~ 2015-08-24 09:44:10.000000000 +0300
++++ note/style.css 2015-08-24 09:44:11.880672429 +0300
+@@ -1,10 +1,7 @@
+ .noteclassic, .noteimportant, .notewarning, .notetip {
+ margin: 2em;
+- margin-left: auto;
+- margin-right: auto;
+- width: 70% !important;
++ width: 65% !important;
+ min-height: 40px;
+- clear: both;
+ text-align: justify;
+ vertical-align: middle;
+ border-collapse: collapse;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-note.git/commitdiff/7e5d1c619e43872ef27acb65ea0e7260e6d477f4
More information about the pld-cvs-commit
mailing list