From 4ae6a712fbd3d9d3acf4b4f74580011a5df05260 Mon Sep 17 00:00:00 2001
From: T.C. Hollingsworth <tchollingsworth@gmail.com>
Date: Jul 29 2013 23:47:12 +0000
Subject: Merge branch 'master' into f18


Conflicts:
	nodejs-packaging.spec

---

diff --git a/.gitignore b/.gitignore
index 500d525..a1e7e24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /nodejs-packaging-fedora-2.tar.xz
 /nodejs-packaging-fedora-3.tar.xz
+/nodejs-packaging-fedora-4.tar.xz
diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec
index f2289ae..110cee1 100644
--- a/nodejs-packaging.spec
+++ b/nodejs-packaging.spec
@@ -1,5 +1,5 @@
 Name:           nodejs-packaging
-Version:        3
+Version:        4
 Release:        1%{?dist}
 Summary:        RPM Macros and Utilities for Node.js Packaging
 BuildArch:      noarch
@@ -8,6 +8,7 @@ URL:            https://fedoraproject.org/wiki/Node.js/Packagers
 Source0:        https://fedorahosted.org/released/%{name}/%{name}-fedora-%{version}.tar.xz
 ExclusiveArch:  %{ix86} x86_64 %{arm} noarch
 
+
 #nodejs-devel before 0.10.12 provided these macros and owned /usr/share/node
 Requires:       nodejs(engine) >= 0.10.12
 Requires:       redhat-rpm-config
@@ -39,6 +40,9 @@ install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules
 %doc LICENSE
 
 %changelog
+* Mon Jul 29 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 4-1
+- handle cases where the symlink target exists gracefully
+
 * Wed Jul 10 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 3-1
 - dependencies and engines can be lists or strings too
 - handle unversioned dependencies on multiply versioned modules correctly
diff --git a/sources b/sources
index 2a82e73..de539ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db11ae6bd03735ac97e1329fbc82f38c  nodejs-packaging-fedora-3.tar.xz
+162c62e0164591c950123508cce1d9fe  nodejs-packaging-fedora-4.tar.xz