diff --git a/.gitignore b/.gitignore index 77edd07..3115223 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /zipfile-0.4.3.tgz /zipfile-0.5.0.tgz /node-zipfile-66c2e58bf1c65c77564f571cc405badadba45a6d.tar.gz +/node-zipfile-d7576233c3c2b75bfda2c32bad7c5bd67f6c03e1.tar.gz diff --git a/nodejs-zipfile-pregyp.patch b/nodejs-zipfile-pregyp.patch index 81a55d3..487c570 100644 --- a/nodejs-zipfile-pregyp.patch +++ b/nodejs-zipfile-pregyp.patch @@ -1,4 +1,4 @@ -commit 763d684ab58fd1e4aa524e7ced960549fd6bd7ac +commit 1f93ee9bc4725e699dc188fd5c015d77558e4eb8 Author: Tom Hughes Date: Fri Mar 14 19:26:20 2014 +0000 @@ -17,16 +17,16 @@ index c7748be..1bb4894 100644 exports = module.exports = zipfile; diff --git a/package.json b/package.json -index 9b8af6d..4ccb13a 100644 +index 1070e46..1994167 100644 --- a/package.json +++ b/package.json -@@ -12,9 +12,6 @@ - "author" : "Dane Springmeyer ", +@@ -13,8 +13,7 @@ "contributors" : [], "licenses" : ["BSD"], -- "dependencies" : { + "dependencies" : { +- "nan": "~1.2.0", - "node-pre-gyp": "0.5.x" -- }, ++ "nan": "~1.2.0" + }, "bundledDependencies":["node-pre-gyp"], "devDependencies": { - "mocha": "*", diff --git a/nodejs-zipfile.spec b/nodejs-zipfile.spec index 7683968..ef4178d 100644 --- a/nodejs-zipfile.spec +++ b/nodejs-zipfile.spec @@ -1,8 +1,8 @@ -%global commit 66c2e58bf1c65c77564f571cc405badadba45a6d +%global commit d7576233c3c2b75bfda2c32bad7c5bd67f6c03e1 Name: nodejs-zipfile -Version: 0.5.2 -Release: 2%{?dist} +Version: 0.5.3 +Release: 1%{?dist} Summary: C++ library for handling zipfiles in Node.js License: BSD @@ -16,6 +16,7 @@ BuildRequires: node-gyp BuildRequires: libzip-devel >= 0.11.2 BuildRequires: zlib-devel +BuildRequires: npm(nan) >= 1.2.0 BuildRequires: npm(mocha) BuildRequires: npm(mkdirp) @@ -28,11 +29,14 @@ Bindings to libzip for handling zipfile archives in Node.js. %prep %setup -q -n node-zipfile-%{commit} %patch0 -p1 +%nodejs_fixdep -r nan +%nodejs_fixdep --dev nan "~1.2.0" rm -rf deps/* node_modules echo "{}" > deps/common-libzip.gypi %build +%nodejs_symlink_deps --build export CXXFLAGS="%{optflags}" node-gyp configure -- -Dshared_libzip=true -Dmodule_name=zipfile -Dmodule_path=lib/binding node-gyp build @@ -55,6 +59,9 @@ cp -pr package.json lib %{buildroot}/%{nodejs_sitearch}/zipfile %changelog +* Fri Aug 1 2014 Tom Hughes - 0.5.3-1 +- Update to 0.5.3 upstream release + * Sat Jun 07 2014 Fedora Release Engineering - 0.5.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 8cff495..1197c08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8403c29eebed6f79e0904e4dfd8a790 node-zipfile-66c2e58bf1c65c77564f571cc405badadba45a6d.tar.gz +6ff5304e8bd1bf7ea305e94906a49182 node-zipfile-d7576233c3c2b75bfda2c32bad7c5bd67f6c03e1.tar.gz