Merge branch 'master' into f18

Conflicts: nodejs-packaging.spec
restrict to compatible arches
2013-07-29 16:47:12 -07:00 · 2013-07-10 03:53:37 -07:00
1 changed files with 2 additions and 1 deletions
--- a/nodejs-packaging.spec
+++ b/nodejs-packaging.spec
@ -6,7 +6,8 @@ BuildArch:      noarch
 License:        MIT
 URL:            https://fedoraproject.org/wiki/Node.js/Packagers
 Source0:        https://fedorahosted.org/released/%{name}/%{name}-fedora-%{version}.tar.xz
-ExclusiveArch:  %{nodejs_arches} noarch
+ExclusiveArch:  %{ix86} x86_64 %{arm} noarch
 #nodejs-devel before 0.10.12 provided these macros and owned /usr/share/node
 Requires:       nodejs(engine) >= 0.10.12
Author	SHA1	Message	Date
T.C. Hollingsworth	4ae6a712fb	Merge branch 'master' into f18 Conflicts: nodejs-packaging.spec	2013-07-29 16:47:12 -07:00
T.C. Hollingsworth	4f4dada80a	restrict to compatible arches	2013-07-10 03:53:37 -07:00