From a6e87fa0101d181cbbc904c3eb393a5718d31b1d Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j@jamielinux.com>
Date: Apr 19 2014 13:19:02 +0000
Subject: Update to upstream release 0.3.2


---

diff --git a/.gitignore b/.gitignore
index d178a74..864ac3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /tests-v0.2.8.tar.bz2
 /marked-0.2.9.tgz
 /tests-v0.2.9.tar.bz2
+/marked-0.3.2.tgz
+/tests-v0.3.2.tar.bz2
diff --git a/dl-tests.sh b/dl-tests.sh
index daf1cfd..6e4a015 100644
--- a/dl-tests.sh
+++ b/dl-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-tag=v0.2.9
+tag=v0.3.2
 
 set -e
 
diff --git a/marked-0.2.8-fix-link-defs-after-blocks.patch b/marked-0.2.8-fix-link-defs-after-blocks.patch
deleted file mode 100644
index d32bebf..0000000
--- a/marked-0.2.8-fix-link-defs-after-blocks.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/lib/marked.js
-+++ b/lib/marked.js
-@@ -18,8 +18,8 @@
-   heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
-   nptable: noop,
-   lheading: /^([^\n]+)\n *(=|-){3,} *\n*/,
--  blockquote: /^( *>[^\n]+(\n[^\n]+)*\n*)+/,
--  list: /^( *)(bull) [\s\S]+?(?:hr|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
-+  blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
-+  list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
-   html: /^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,
-   def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
-   table: noop,
-@@ -36,6 +36,11 @@
- block.list = replace(block.list)
-   (/bull/g, block.bullet)
-   ('hr', /\n+(?=(?: *[-*_]){3,} *(?:\n+|$))/)
-+  ('def', '\\n+(?=' + block.def.source + ')')
-+  ();
-+
-+block.blockquote = replace(block.blockquote)
-+  ('def', block.def)
-   ();
- 
- block._tag = '(?!(?:'
-@@ -139,7 +144,7 @@
-  * Lexing
-  */
- 
--Lexer.prototype.token = function(src, top) {
-+Lexer.prototype.token = function(src, top, bq) {
-   var src = src.replace(/^ +$/gm, '')
-     , next
-     , loose
-@@ -262,7 +267,7 @@
-       // Pass `top` to keep the current
-       // "toplevel" state. This is exactly
-       // how markdown.pl works.
--      this.token(cap, top);
-+      this.token(cap, top, true);
- 
-       this.tokens.push({
-         type: 'blockquote_end'
-@@ -335,7 +340,7 @@
-         });
- 
-         // Recurse.
--        this.token(item, false);
-+        this.token(item, false, bq);
- 
-         this.tokens.push({
-           type: 'list_item_end'
-@@ -363,7 +368,7 @@
-     }
- 
-     // def
--    if (top && (cap = this.rules.def.exec(src))) {
-+    if ((!bq && top) && (cap = this.rules.def.exec(src))) {
-       src = src.substring(cap[0].length);
-       this.tokens.links[cap[1].toLowerCase()] = {
-         href: cap[2],
diff --git a/marked.spec b/marked.spec
index b1596bf..5566cda 100644
--- a/marked.spec
+++ b/marked.spec
@@ -3,8 +3,8 @@
 %global enable_tests 0
 
 Name:       marked
-Version:    0.2.9
-Release:    3%{?dist}
+Version:    0.3.2
+Release:    1%{?dist}
 Summary:    A markdown parser for Node.js built for speed
 License:    MIT
 Group:      System Environment/Libraries
@@ -23,15 +23,14 @@ ExclusiveArch: %{nodejs_arches} noarch
 ExclusiveArch: %{ix86} x86_64 %{arm} noarch
 %endif
 
-Patch0:     %{name}-0.2.8-fix-link-defs-after-blocks.patch
-
 BuildRequires:  nodejs-packaging
 
 %if 0%{?enable_tests}
 BuildRequires:  npm(express)
 BuildRequires:  npm(markdown)
-BuildRequires:  npm(robotskirt)
 BuildRequires:  npm(showdown)
+# Not yet packaged for Fedora.
+# BuildRequires:  npm(robotskirt)
 %endif
 
 %description
@@ -51,7 +50,6 @@ pass more than a few tests.
 %prep
 %setup -q -n package
 %setup -q -T -D -a 1 -n package
-%patch0 -p1
 
 
 %build
@@ -60,7 +58,7 @@ pass more than a few tests.
 
 %install
 mkdir -p %{buildroot}%{nodejs_sitelib}/marked
-cp -pr package.json lib/ \
+cp -pr package.json component.json lib/ \
     %{buildroot}%{nodejs_sitelib}/marked
 mkdir -p %{buildroot}%{nodejs_sitelib}/marked/bin
 install -p -D -m0755 bin/marked \
@@ -78,9 +76,6 @@ install -p -D -m0644 man/marked.1 \
 
 %if 0%{?enable_tests}
 %check
-# gfm_break test will always fail due to author's choice not to include gfm
-# line breaks: https://github.com/chjj/marked/issues/49
-
 # gfm_code_hr_list test is known to fail but the author has not yet arrived
 # at a satisfactory solution: https://github.com/chjj/marked/pull/118
 
@@ -88,18 +83,22 @@ install -p -D -m0644 man/marked.1 \
 # https://github.com/chjj/marked/issues/136#issuecomment-15016714
 
 %nodejs_symlink_deps --check
+# /usr/bin/npm install robotskirt
 %__nodejs ./test/
 %endif
 
 
 %files
-%doc LICENSE README.md
+%doc LICENSE README.md doc/
 %{nodejs_sitelib}/marked
 %{_bindir}/marked
 %{_mandir}/man1/marked.1*
 
 
 %changelog
+* Sat Apr 19 2014 Jamie Nguyen <jamielinux@fedoraproject.org> - 0.3.2-1
+- update to upstream release 0.3.2
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index be83c79..f993c12 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a500ddbd037186ae2c980facb4f8da23  marked-0.2.9.tgz
-b5a7cc426be48d7987e7f5b0b4f24ea1  tests-v0.2.9.tar.bz2
+bcab6f85bf74e63513a279e598a248d4  marked-0.3.2.tgz
+927f2c52b5952d5363e94f66e7932798  tests-v0.3.2.tar.bz2