[nodejs-node-markdown] Link showdown to lib/vendor instead of patching paths

Tom Hughes tomh at fedoraproject.org
Tue Jul 16 19:59:39 UTC 2013


commit 8985a74476c3aa0ef71eb0c1dc45e9bf28f760c4
Author: Tom Hughes <tom at compton.nu>
Date:   Tue Jul 16 20:58:38 2013 +0100

    Link showdown to lib/vendor instead of patching paths
    
    This ensures that we appear the same as an upstream one that
    is using the bundled showdown.

 nodejs-node-markdown-showdown.patch |   34 ----------------------------------
 nodejs-node-markdown.spec           |   15 ++++++++++-----
 2 files changed, 10 insertions(+), 39 deletions(-)
---
diff --git a/nodejs-node-markdown.spec b/nodejs-node-markdown.spec
index cf0a4af..cf01fa5 100644
--- a/nodejs-node-markdown.spec
+++ b/nodejs-node-markdown.spec
@@ -1,16 +1,16 @@
 Name:           nodejs-node-markdown
 Version:        0.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parse markdown syntax with Node.js
 
 License:        BSD
 URL:            https://github.com/andris9/node-markdown
 Source0:        http://registry.npmjs.org/node-markdown/-/node-markdown-%{version}.tgz
-# Use external showdown as a dependency
-Patch0:         nodejs-node-markdown-showdown.patch
 BuildArch:      noarch
+ExclusiveArch:  %{nodejs_arches} noarch
 
-BuildRequires:  nodejs-devel
+BuildRequires:  nodejs-packaging
+Requires:       npm(showdown)
 
 %description
 Based on showdown parser and parses markdown syntax into HTML code.
@@ -18,7 +18,6 @@ Based on showdown parser and parses markdown syntax into HTML code.
 
 %prep
 %setup -q -n package
-%patch0 -p1
 rm -rf node_modules lib/vendor
 
 
@@ -28,6 +27,8 @@ rm -rf node_modules lib/vendor
 %install
 mkdir -p %{buildroot}/%{nodejs_sitelib}/node-markdown
 cp -pr package.json lib %{buildroot}/%{nodejs_sitelib}/node-markdown
+mkdir -p %{buildroot}/%{nodejs_sitelib}/node-markdown/lib/vendor
+ln -sf %{nodejs_sitelib}/showdown %{buildroot}/%{nodejs_sitelib}/node-markdown/lib/vendor
 %nodejs_symlink_deps
 
 
@@ -37,5 +38,9 @@ cp -pr package.json lib %{buildroot}/%{nodejs_sitelib}/node-markdown
 
 
 %changelog
+* Tue Jul 16 2013 Tom Hughes <tom at compton.nu> - 0.1.1-2
+- Link showdown to lib/vendor instead of patching paths
+- Update to latest nodejs packaging standards
+
 * Sun Feb 10 2013 Tom Hughes <tom at compton.nu> - 0.1.1-1
 - Initial build of 0.1.1


More information about the scm-commits mailing list