[nodejs-zipfile] Update to 0.4.0 upstream release

Tom Hughes tomh at fedoraproject.org
Sun Aug 11 11:40:17 UTC 2013


commit 1452eed9a824e322fda6ef87f65c7dfa34733179
Author: Tom Hughes <tom at compton.nu>
Date:   Sun Aug 11 12:24:27 2013 +0100

    Update to 0.4.0 upstream release

 .gitignore                     |    1 +
 nodejs-zipfile-libraries.patch |   15 ---------------
 nodejs-zipfile-uv.patch        |   32 --------------------------------
 nodejs-zipfile.spec            |   26 ++++++++++++--------------
 sources                        |    2 +-
 5 files changed, 14 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bbd23d1..58eed03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /zipfile-0.3.4.tgz
+/zipfile-0.4.0.tgz
diff --git a/nodejs-zipfile.spec b/nodejs-zipfile.spec
index 6873e64..0917605 100644
--- a/nodejs-zipfile.spec
+++ b/nodejs-zipfile.spec
@@ -1,19 +1,14 @@
 %global enable_tests 1
 
 Name:           nodejs-zipfile
-Version:        0.3.4
-Release:        5%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        C++ library for handling zipfiles in Node.js
 
 License:        BSD
 URL:            https://github.com/springmeyer/node-zipfile
 Source0:        http://registry.npmjs.org/zipfile/-/zipfile-%{version}.tgz
-# Link against system libraries
-Patch0:         nodejs-zipfile-libraries.patch
-# Offered upstream - https://github.com/springmeyer/node-zipfile/pull/30
-Patch1:         nodejs-zipfile-uv.patch
-
-ExclusiveArch:  %{ix86} x86_64 %{arm}
+ExclusiveArch:  %{nodejs_arches}
 
 BuildRequires:  nodejs-devel
 BuildRequires:  node-gyp
@@ -33,9 +28,8 @@ Bindings to libzip for handling zipfile archives in Node.js.
 
 %prep
 %setup -q -n package
-%patch0 -p0 -b .libraries
-%patch1 -p1 -b .uv
-rm -rf deps node_modules
+rm -rf deps/* node_modules
+echo "{}" > deps/common-libzip.gypi
 # Fix file names corrupted in NPM registry tar ball, see:
 # https://github.com/springmeyer/node-zipfile/issues/29
 mv test/data/Clément test/data/Clément
@@ -44,8 +38,8 @@ mv test/data/Clément/Olá.zip test/data/Clément/Olá.zip
 
 %build
 export CXXFLAGS="%{optflags}"
-node-gyp rebuild
-install -p -D -m0755 build/Release/_zipfile.node lib
+node-gyp configure -- -Dlibzip=/usr
+node-gyp build
 
 
 %install
@@ -56,7 +50,7 @@ cp -pr package.json lib %{buildroot}/%{nodejs_sitearch}/zipfile
 
 %if 0%{?enable_tests}
 %check
-ln -s %{nodejs_sitelib} .
+%nodejs_symlink_deps --check
 NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec
 %endif
 
@@ -67,6 +61,10 @@ NODE_PATH=lib %{nodejs_sitelib}/mocha/bin/mocha -R spec
 
 
 %changelog
+* Sun Aug 11 2013 Tom Hughes <tom at compton.nu> - 0.4.0-1
+- Update to 0.4.0 upstream release
+- Update to latest nodejs packaging standards
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 0e0702d..62d0289 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4cca70944dac645bcc8cbf85f45ba1fd  zipfile-0.3.4.tgz
+d70338e88d0f58a23187fbedc1f1b174  zipfile-0.4.0.tgz


More information about the scm-commits mailing list