From 63d7f5cfb1214f9a1f14a0cb4328e2bfe50330ac Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@redhat.com>
Date: Dec 30 2015 05:55:35 +0000
Subject: fix merge conflicts


---

diff --git a/nodejs-jsonparse.spec b/nodejs-jsonparse.spec
index 026a597..eb07ea2 100644
--- a/nodejs-jsonparse.spec
+++ b/nodejs-jsonparse.spec
@@ -1,8 +1,10 @@
 %{?nodejs_find_provides_and_requires}
 
-Name:       nodejs-jsonparse
+%global module_name jsonparse
+
+Name:       nodejs-%{module_name}
 Version:    1.0.0
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Pure-js JSON streaming parser for node.js
 License:    MIT
 Group:      System Environment/Libraries
@@ -16,39 +18,36 @@ BuildRequires:  nodejs-packaging
 BuildRequires:  npm(tap)
 BuildRequires:  npm(tape)
 
-ExclusiveArch: %{nodejs_arches} noarch
+ExclusiveArch:  %{ix86} x86_64 %{arm} noarch
 
 %description
 This is a streaming JSON parser for Node.js
 
-
-
 %prep
 %setup -q -n package
 
-
 %build
 #nothing to do
 
-
 %install
 mkdir -p %{buildroot}%{nodejs_sitelib}/jsonparse
 cp -pr jsonparse.js package.json \
     %{buildroot}%{nodejs_sitelib}/jsonparse
 
-
-
 %check
 %nodejs_symlink_deps --check
 /usr/bin/tap  test/*.js
 
 %files
-%doc LICENSE README.markdown examples/
-%{nodejs_sitelib}/jsonparse
-
-
+%{!?_licensedir:%global license %doc}
+%doc README.markdown examples
+%license LICENSE
+%{nodejs_sitelib}/%{module_name}
 
 %changelog
+* Wed Dec 30 2015 Parag Nemade <pnemade AT redhat DOT com> - 1.0.0-2
+- Specify exclusively arch list as per nodejs packaging guidelines
+
 * Fri Feb 06 2015 Anish Patil <apatil@redhat.com> - 1.0.0-1
 - Upstream has released new version