fix minor bugs in RPM magic

.gitignore

@@ -1,2 +1,3 @@
 /node-v0.9.3.tar.gz
 /node-v0.9.4.tar.gz
+/node-v0.9.5.tar.gz

macros.nodejs

@@ -9,4 +9,4 @@
 
 # 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}
+%nodejs_symlink_deps %{_rpmconfigdir}/nodejs-symlink-deps %{nodejs_sitelib}

nodejs-symlink-deps

@@ -39,5 +39,6 @@ metadata = json.load(open('package.json'))
 
 os.chdir('node_modules')
 
-for dep in metadata['dependencies'].iterkeys():
+if 'dependencies' in metadata:
+    for dep in metadata['dependencies'].iterkeys():
         os.symlink(os.path.join(sitelib, dep), dep)

nodejs.req

@@ -71,7 +71,7 @@ def process_dep(req, version):
     #there's no way RPM can do anything like an OR dependency
     if '||' in version:
         sys.stderr.write("WARNING: The {0} dependency contains an ".format(req) +
-            "OR (||) dependency: '{0}.  Please manually include ".format(version) +
+            "OR (||) dependency: '{0}.\nPlease manually include ".format(version) +
             "a versioned dependency in your spec file if necessary")
         deps.append(req)
             
@@ -93,11 +93,6 @@ def process_dep(req, version):
                 if m:
                     deps += convert_dep(req, m.group(1), m.group(2))
         else:
-            #uh oh!
-            sys.stderr.write('WARNING: the automatic dependency generator ' +
-                'couldn\'t parse the entry for {0}. '.format(req) +
-                'Please check to see if the package.json is valid. If so, file ' +
-                'a bug against the nodejs package in bugzilla.')
             deps.append(req)
 
     return deps

nodejs.spec

@@ -136,6 +136,8 @@ rm -f %{_defaultdocdir}/%{name}-docs-%{version}/html/nodejs.1
 %changelog
 * Tue Jan 01 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.9.5-1
 - new upstream release 0.9.5
+- provide nodejs-devel for the moment
+- fix minor bugs in RPM magic
 
 * Wed Dec 26 2012 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.9.4-1
 - new upstream release 0.9.4

sources

@@ -0,0 +1 @@
+50f1c8bc2390b47e7f3b8a5d59c25909  node-v0.9.5.tar.gz