[nodejs-get/f18] Replace local patch with correct one from upstream

Tom Hughes tomh at fedoraproject.org
Sat Jun 8 00:53:22 UTC 2013


commit 807da991c5dd9de2902ae1f264a58858f3a76bad
Author: Tom Hughes <tom at compton.nu>
Date:   Sat Jun 8 01:28:00 2013 +0100

    Replace local patch with correct one from upstream

 nodejs-get-end.patch    |   33 ---------------------------------
 nodejs-get-resume.patch |   18 ++++++++++++++++++
 nodejs-get.spec         |    9 ++++++---
 3 files changed, 24 insertions(+), 36 deletions(-)
---
diff --git a/nodejs-get-resume.patch b/nodejs-get-resume.patch
new file mode 100644
index 0000000..6557d09
--- /dev/null
+++ b/nodejs-get-resume.patch
@@ -0,0 +1,18 @@
+commit 05a5735327f467f10744336ee6f1eb472bf7f5b4
+Author: Ian Ward <ianshward at gmail.com>
+Date:   Thu Jun 6 17:02:33 2013 -0400
+
+    resume the stream for node v0.10 compatiblity
+
+diff --git a/lib/node-get/node-get.js b/lib/node-get/node-get.js
+index 1c84d43..057dc19 100644
+--- a/lib/node-get/node-get.js
++++ b/lib/node-get/node-get.js
+@@ -131,6 +131,7 @@ Get.prototype.perform = function(callback, times) {
+ 
+     var clientrequest = this.request(function handleClientRequest(response, err) {
+         if (err) return callback.call(this, err, null);
++        response.resume();
+         if (response.statusCode >= 300 &&
+             response.statusCode < 400 &&
+             response.headers.location) {
diff --git a/nodejs-get.spec b/nodejs-get.spec
index 50886ff..bb94095 100644
--- a/nodejs-get.spec
+++ b/nodejs-get.spec
@@ -2,7 +2,7 @@
 
 Name:           nodejs-get
 Version:        1.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A slightly higher-level HTTP client for node
 
 License:        BSD
@@ -15,8 +15,8 @@ Source1:        get-tests-v%{version}.tar.bz2
 Source10:       get-dl-tests.sh
 # Accepted upstream - https://github.com/developmentseed/node-get/pull/6
 Patch0:         nodejs-get-md5.patch
-# Offered upstream - https://github.com/developmentseed/node-get/pull/7
-Patch1:         nodejs-get-end.patch
+# From upstream - https://github.com/developmentseed/node-get/commit/05a5735327f467f10744336ee6f1eb472bf7f5b4
+Patch1:         nodejs-get-resume.patch
 BuildArch:      noarch
 
 BuildRequires:  nodejs-devel
@@ -59,6 +59,9 @@ cp -pr package.json lib %{buildroot}/%{nodejs_sitelib}/get
 
 
 %changelog
+* Fri Jun  7 2013 Tom Hughes <tom at compton.nu> - 1.2.1-3
+- Replace local patch with one from upstream
+
 * Tue Apr 30 2013 Tom Hughes <tom at compton.nu> - 1.2.1-2
 - Add comments to document patches
 - Increase timeout on tests


More information about the scm-commits mailing list