[nodejs] add %nodejs_fixdep macro
T.C. Hollingsworth
patches at fedoraproject.org
Wed Jan 2 01:03:36 UTC 2013
commit 753bbecb1db015cbd418937f7036b5f3052980a3
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date: Tue Jan 1 18:01:34 2013 -0700
add %nodejs_fixdep macro
macros.nodejs | 9 ++++++++-
nodejs-fixdep | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
nodejs.spec | 4 ++++
3 files changed, 67 insertions(+), 1 deletions(-)
---
diff --git a/macros.nodejs b/macros.nodejs
index 9507ada..a7d431f 100644
--- a/macros.nodejs
+++ b/macros.nodejs
@@ -9,4 +9,11 @@
# symlink dependencies so `npm link` works
# this should be run in every module's %%install section
-%nodejs_symlink_deps %{_rpmconfigdir}/nodejs-symlink-deps %{nodejs_sitelib}
\ No newline at end of file
+%nodejs_symlink_deps %{_rpmconfigdir}/nodejs-symlink-deps %{nodejs_sitelib}
+
+# patch package.json to fix a dependency
+# see `man npm-json` for details on writing dependencies for package.json files
+# e.g. `%%nodejs_fixdep frobber` makes any version of frobber do
+# `%%nodejs_fixdep frobber '>1.0'` requires frobber > 1.0
+# `%%nodejs_fixdep -r frobber removes the frobber dep
+%nodejs_fixdep %{_rpmconfigdir}/nodejs-fixdep
\ No newline at end of file
diff --git a/nodejs-fixdep b/nodejs-fixdep
new file mode 100755
index 0000000..087cdf3
--- /dev/null
+++ b/nodejs-fixdep
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+
+"""Modify a dependency listed in a package.json file"""
+
+# Copyright 2013 T.C. Hollingsworth <tchollingsworth at gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+import json
+import os
+import shutil
+import sys
+
+if not os.path.exists('package.json'):
+ shutil.copy2('package.json', 'package.json~')
+
+md = json.load(open('package.json'))
+
+if not 'dependencies':
+ sys.stderr.write("No dependencies listed in this module's package.json\n")
+ sys.exit(2)
+
+if sys.argv[1] == '-r':
+ dep = sys.argv[2]
+ del md['dependencies'][dep]
+else:
+ dep = sys.argv[1]
+
+ if len(sys.argv) > 2:
+ ver = sys.argv[2]
+ else:
+ ver = '*'
+
+ md['dependencies'][dep] = ver
+
+fh = open('package.json', 'w')
+data = json.JSONEncoder(indent=4).encode(md)
+fh.write(data)
+fh.close()
diff --git a/nodejs.spec b/nodejs.spec
index d22ff96..b47409c 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -11,6 +11,7 @@ Source2: nodejs.attr
Source3: nodejs.prov
Source4: nodejs.req
Source5: nodejs-symlink-deps
+Source6: nodejs-fixdep
BuildRequires: v8-devel
BuildRequires: http-parser-devel >= 2.0
BuildRequires: libuv-devel >= %{version}
@@ -114,6 +115,7 @@ install -Dpm0644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr
install -pm0755 %{SOURCE3} %{buildroot}%{_rpmconfigdir}/nodejs.prov
install -pm0755 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/nodejs.req
install -pm0755 %{SOURCE5} %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps
+install -pm0755 %{SOURCE6} %{buildroot}%{_rpmconfigdir}/nodejs-fixdep
#install documentation
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-docs-%{version}/html
@@ -138,6 +140,8 @@ rm -f %{_defaultdocdir}/%{name}-docs-%{version}/html/nodejs.1
- new upstream release 0.9.5
- provide nodejs-devel for the moment
- fix minor bugs in RPM magic
+- add nodejs_fixdep macro so packagers can easily adjust dependencies in
+ package.json files
* Wed Dec 26 2012 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.9.4-1
- new upstream release 0.9.4
More information about the scm-commits
mailing list