rel-eng/packages/nodejs-packaging | 2 -
spec-tree/nodejs-less/nodejs-less.spec | 3 ++
spec-tree/nodejs-packaging/nodejs-packaging-python24.patch | 14 ++++++++++++-
spec-tree/nodejs-packaging/nodejs-packaging.spec | 5 +++-
4 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit ae3bda2839bc2899e5cf2796a073b413ad999fb6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 20 13:46:48 2013 +0100
Automatic commit of package [nodejs-packaging] minor release [4-1.3].
diff --git a/rel-eng/packages/nodejs-packaging b/rel-eng/packages/nodejs-packaging
index 8d1d33f..9c92430 100644
--- a/rel-eng/packages/nodejs-packaging
+++ b/rel-eng/packages/nodejs-packaging
@@ -1 +1 @@
-4-1.2 spec-tree/nodejs-packaging/
+4-1.3 spec-tree/nodejs-packaging/
diff --git a/spec-tree/nodejs-packaging/nodejs-packaging.spec b/spec-tree/nodejs-packaging/nodejs-packaging.spec
index 3235898..f948c32 100644
--- a/spec-tree/nodejs-packaging/nodejs-packaging.spec
+++ b/spec-tree/nodejs-packaging/nodejs-packaging.spec
@@ -1,6 +1,6 @@
Name: nodejs-packaging
Version: 4
-Release: 1.2%{?dist}
+Release: 1.3%{?dist}
Summary: RPM Macros and Utilities for Node.js Packaging
BuildArch: noarch
License: MIT
@@ -43,6 +43,9 @@ install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules
%doc LICENSE
%changelog
+* Wed Nov 20 2013 Michael Mraka <michael.mraka(a)redhat.com> 4-1.3
+- more python 2.4 fixes
+
* Wed Nov 20 2013 Michael Mraka <michael.mraka(a)redhat.com> 4-1.2
- modified for python 2.4
commit 4ba8c34ddd1d0944b42b50abd2ab7d36aed67881
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 20 13:45:17 2013 +0100
more python 2.4 fixes
diff --git a/spec-tree/nodejs-packaging/nodejs-packaging-python24.patch b/spec-tree/nodejs-packaging/nodejs-packaging-python24.patch
index 5c5930b..25ca9f7 100644
--- a/spec-tree/nodejs-packaging/nodejs-packaging-python24.patch
+++ b/spec-tree/nodejs-packaging/nodejs-packaging-python24.patch
@@ -42,4 +42,16 @@
import re
import subprocess
import sys
-
+@@ -129,9 +129,9 @@
+ #oh boy, here we go...
+ else:
+ #split the dotted portions into a list (handling trailing dots properly)
+- parts = [part if part else 'x' for part in version.split('.')]
+- parts = [int(part) if part != 'x' and not '-' in part
+- else part for part in parts]
++ parts = [part or 'x' for part in version.split('.')]
++ parts = [(part != 'x' and not '-' in part) and int(part)
++ or part for part in parts]
+
+ # 1 or 1.x or 1.x.x or ~1
+ if len(parts) == 1 or parts[1] == 'x':
commit fa2b096ff007f3c8ab884298db684199b6293ac2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Nov 20 11:36:46 2013 +0100
packaging changes for RHEL5
diff --git a/spec-tree/nodejs-less/nodejs-less.spec b/spec-tree/nodejs-less/nodejs-less.spec
index e6c8327..f548a7d 100644
--- a/spec-tree/nodejs-less/nodejs-less.spec
+++ b/spec-tree/nodejs-less/nodejs-less.spec
@@ -21,6 +21,9 @@ BuildArch: noarch
BuildRequires: nodejs-devel
Requires: nodejs
ExclusiveArch: %{ix86} %{arm} x86_64 noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%global _rpmconfigdir /usr/lib/rpm
Provides: lessjs = %{version}-%{release}
Obsoletes: lessjs < 1.3.3-2