From 6b0dcfcf81fb21a109b987e2aacafb16e2ac8aa1 Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j@jamielinux.com>
Date: Aug 18 2013 15:13:17 +0000
Subject: Merge branch 'master' into f18


---

diff --git a/dl-tests.sh b/dl-tests.sh
old mode 100755
new mode 100644
diff --git a/marked.spec b/marked.spec
index 297e30d..b1596bf 100644
--- a/marked.spec
+++ b/marked.spec
@@ -4,7 +4,7 @@
 
 Name:       marked
 Version:    0.2.9
-Release:    1%{?dist}
+Release:    3%{?dist}
 Summary:    A markdown parser for Node.js built for speed
 License:    MIT
 Group:      System Environment/Libraries
@@ -15,11 +15,17 @@ Source0:    http://registry.npmjs.org/marked/-/marked-%{version}.tgz
 # version control repository.
 Source1:    tests-v%{version}.tar.bz2
 Source10:   dl-tests.sh
+
 BuildArch:  noarch
+%if 0%{?fedora} >= 19
+ExclusiveArch: %{nodejs_arches} noarch
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm} noarch
+%endif
 
 Patch0:     %{name}-0.2.8-fix-link-defs-after-blocks.patch
 
-BuildRequires:  nodejs-devel
+BuildRequires:  nodejs-packaging
 
 %if 0%{?enable_tests}
 BuildRequires:  npm(express)
@@ -81,7 +87,7 @@ install -p -D -m0644 man/marked.1 \
 # def_blocks and double_link are also known to fail:
 # https://github.com/chjj/marked/issues/136#issuecomment-15016714
 
-ln -sf %{nodejs_sitelib} .
+%nodejs_symlink_deps --check
 %__nodejs ./test/
 %endif
 
@@ -94,6 +100,12 @@ ln -sf %{nodejs_sitelib} .
 
 
 %changelog
+* 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
+
+* Thu Jun 27 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 0.2.9-2
+- restrict to compatible arches
+
 * Fri May 31 2013 Jamie Nguyen <jamielinux@fedoraproject.org> - 0.2.9-1
 - update to upstream release 0.2.9