From ac02601d361dc1640d361a1236f13c545df0c22d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 04 2015 08:15:15 +0000 Subject: import nodejs010-npm-1.4.28-3.el7 --- diff --git a/.gitignore b/.gitignore index 68b6f43..d94d9b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/npm-1.3.24-stripped.tar.gz +SOURCES/npm-1.4.28-stripped.tar.gz diff --git a/.nodejs010-npm.metadata b/.nodejs010-npm.metadata index d2a3b43..0e981e0 100644 --- a/.nodejs010-npm.metadata +++ b/.nodejs010-npm.metadata @@ -1 +1 @@ -6efa73d9716800d0cdd4b253632d2c22ab0978de SOURCES/npm-1.3.24-stripped.tar.gz +5c037ccb83cfac6f387553f5d6fc1ee627ba1385 SOURCES/npm-1.4.28-stripped.tar.gz diff --git a/SPECS/npm.spec b/SPECS/npm.spec index 6c2d934..0f9f4cb 100644 --- a/SPECS/npm.spec +++ b/SPECS/npm.spec @@ -4,13 +4,13 @@ %{?nodejs_find_provides_and_requires} Name: %{?scl_prefix}npm -Version: 1.3.24 -Release: 5%{?dist} +Version: 1.4.28 +Release: 3%{?dist} Summary: Node.js Package Manager License: Artistic 2.0 Group: Development/Tools URL: http://npmjs.org/ -Source0: npm-1.3.24-stripped.tar.gz +Source0: npm-1.4.28-stripped.tar.gz #http://registry.npmjs.org/%{npm_name}/-/%{npm_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,10 +26,9 @@ node programs. It manages dependencies and does other cool stuff. %setup -q -n package %nodejs_fixdep ansi 0.2 -%nodejs_fixdep semver 2.1 %nodejs_fixdep cmd-shim '>1.1' %nodejs_fixdep request '>2.16 <3' - +%nodejs_fixdep columnify 1.3.2 #remove bundled modules rm -rf node_modules @@ -71,9 +70,12 @@ ln -sf %{_defaultdocdir}/%{name}-%{version}/man %{buildroot}%{nodejs_sitelib}/np #%%__nodejs test/run.js #%%tap test/tap/*.js -%pretrans -[ -d %{nodejs_sitelib}/npm/man ] && ! [ -L %{nodejs_sitelib}/npm/man ] && \ -rm -rf %{nodejs_sitelib}/npm/man || : +%pretrans -p +require 'posix' +require 'os' +if (posix.stat("%{nodejs_sitelib}/npm/man", "type") == "directory") and (posix.stat("%{nodejs_sitelib}/npm/man", "type") ~= "link") then + posix.rmdir("%{nodejs_sitelib}/npm/man") +end %clean rm -rf %{buildroot} @@ -88,6 +90,17 @@ rm -rf %{buildroot} %doc AUTHORS man doc html README.md LICENSE %changelog +* Tue Jan 13 2015 Tomas Hrcka - 1.4.28-3 +- Replace != with ~= in lua scriptlet + +* Tue Jan 13 2015 Tomas Hrcka - 1.4.28-2 +- Fix path to lua interpreter + +* Mon Jan 12 2015 Tomas Hrcka - 1.4.28-1 +- New upstream release 1.4.28 +- Pretrans scriptlet changed to lua RHBZ#1149196 +- Remove fix_dep on semver package since we have update + * Fri May 02 2014 Tomas Hrcka - 1.3.24-5 - Add %pretrans scriptlet RHBZ #1092162