[carto] Fix xml2js dependency

Tom Hughes tomh at fedoraproject.org
Thu Dec 5 18:50:53 UTC 2013


commit 317eb507ca638c6c305ef9c49d023cbd53151daa
Author: Tom Hughes <tom at compton.nu>
Date:   Thu Dec 5 18:50:26 2013 +0000

    Fix xml2js dependency

 carto.spec |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/carto.spec b/carto.spec
index e26a0de..4d377ac 100644
--- a/carto.spec
+++ b/carto.spec
@@ -1,8 +1,6 @@
-%global enable_tests 1
-
 Name:           carto
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mapnik style sheet compiler
 
 License:        ASL 2.0
@@ -20,12 +18,10 @@ Requires:       npm(millstone)
 
 BuildRequires:  nodejs-packaging
 
-%if 0%{?enable_tests}
 BuildRequires:  npm(mocha)
 BuildRequires:  npm(mapnik-reference)
 BuildRequires:  npm(sax)
 BuildRequires:  npm(underscore)
-%endif
 
 %description
 Carto is a style sheet compiler for Mapnik. It's an evolution of
@@ -37,6 +33,7 @@ flexibility.
 %setup -q -n package
 %setup -T -D -a 1 -q -n package
 %nodejs_fixdep optimist "~0.4.0"
+%nodejs_fixdep xml2js "~0.4.0"
 rm -rf node_modules
 
 
@@ -54,11 +51,9 @@ cp -p man/*.1 %{buildroot}%{_mandir}/man1
 %nodejs_symlink_deps
 
 
-%if 0%{?enable_tests}
 %check
 %nodejs_symlink_deps --check
 %{nodejs_sitelib}/mocha/bin/mocha -R spec test/*.test.js
-%endif
 
 
 %files
@@ -69,6 +64,9 @@ cp -p man/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Thu Dec  5 2013 Tom Hughes <tom at compton.nu> - 0.9.5-3
+- Fix xml2js dependency
+
 * Wed Oct 30 2013 Tom Hughes <tom at compton.nu> - 0.9.5-2
 - Fix dependencies
 


More information about the scm-commits mailing list