diff --git a/.gitignore b/.gitignore index 270819e..fa84416 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /node-xml2js-a96eab1febb694549d08cbb6f55b058dca7f12d1.tar.gz /node-xml2js-0b2121503d05a9844d7bf286691d3657ece17546.tar.gz /node-xml2js-fafe6fd7a00b3d361d8863882f4a67cb567612e8.tar.gz +/node-xml2js-9678bba6ee805685781d69053c271129d25c5647.tar.gz diff --git a/nodejs-xml2js-xmlbuilder.patch b/nodejs-xml2js-xmlbuilder.patch deleted file mode 100644 index 0bda1dc..0000000 --- a/nodejs-xml2js-xmlbuilder.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit d2ccc41b0f795ee1c2aa04a0e5f10bfb321f12ce -Author: Tom Hughes -Date: Wed Feb 11 18:40:39 2015 +0000 - - Update test result for latest xmlbuilder - -diff --git a/package.json b/package.json -index 1742a07..74f910c 100644 ---- a/package.json -+++ b/package.json -@@ -49,7 +49,7 @@ - }, - "dependencies" : { - "sax" : "0.6.x", -- "xmlbuilder" : ">=1.0.0" -+ "xmlbuilder" : ">=2.4.6" - }, - "devDependencies" : { - "coffee-script" : ">=1.7.1", -diff --git a/test/builder.test.coffee b/test/builder.test.coffee -index 7f8235d..ddb83a6 100644 ---- a/test/builder.test.coffee -+++ b/test/builder.test.coffee -@@ -18,7 +18,7 @@ diffeq = (expected, actual) -> - - module.exports = - 'test building basic XML structure': (test) -> -- expected = '5850440872586764820' -+ expected = '' - obj = {"xml":{"Label":[""],"MsgId":["5850440872586764820"]}} - builder = new xml2js.Builder renderOpts: pretty: false - actual = builder.buildObject obj diff --git a/nodejs-xml2js.spec b/nodejs-xml2js.spec index e5855d8..43a7a86 100644 --- a/nodejs-xml2js.spec +++ b/nodejs-xml2js.spec @@ -1,15 +1,13 @@ -%global commit fafe6fd7a00b3d361d8863882f4a67cb567612e8 +%global commit 9678bba6ee805685781d69053c271129d25c5647 Name: nodejs-xml2js -Version: 0.4.5 -Release: 2%{?dist} +Version: 0.4.6 +Release: 1%{?dist} Summary: Simple XML to JavaScript object converter License: MIT URL: https://github.com/Leonidas-from-XIV/node-xml2js Source0: https://github.com/Leonidas-from-XIV/node-xml2js/archive/%{commit}/node-xml2js-%{commit}.tar.gz -# https://github.com/Leonidas-from-XIV/node-xml2js/pull/177 -Patch0: nodejs-xml2js/nodejs-xml2js-xmlbuilder.patch BuildArch: noarch ExclusiveArch: %{nodejs_arches} noarch @@ -30,7 +28,6 @@ reason? Then xml2js is what you're looking for! %prep %setup -q -n node-xml2js-%{commit} -%patch0 -p1 %nodejs_fixdep sax "~0.5" rm -rf node_modules @@ -55,8 +52,11 @@ cp -pr package.json lib %{buildroot}/%{nodejs_sitelib}/xml2js %changelog +* Sun Mar 15 2015 Tom Hughes - 0.4.6-1 +- Update to 0.4.6 upstream release + * Wed Feb 11 2015 Tom Hughes - 0.4.5-2 -- Patch test result for xmlbuilder 0.4.6 support +- Patch test result for xmlbuilder 2.4.6 support * Wed Feb 11 2015 Tom Hughes - 0.4.5-1 - Update to 0.4.5 upstream release diff --git a/sources b/sources index d559baa..3420c71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4022da36f16a714b98d35927708814cf node-xml2js-fafe6fd7a00b3d361d8863882f4a67cb567612e8.tar.gz +9e1ae8ab9d784d4ac78b3fed0bb89f2e node-xml2js-9678bba6ee805685781d69053c271129d25c5647.tar.gz