diff --git a/.gitignore b/.gitignore index 500d525..9d5d0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ /nodejs-packaging-fedora-2.tar.xz /nodejs-packaging-fedora-3.tar.xz +/nodejs-packaging-el6-3.tar.xz +/nodejs-packaging.spec +/nodejs-packaging-el6-4.tar.xz +/nodejs-packaging-el6-5.tar.xz +/nodejs-packaging-el6-6.tar.xz +/nodejs-packaging-el6-7.tar.xz diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index bcc4151..bacb5ac 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -1,11 +1,12 @@ Name: nodejs-packaging -Version: 3 +Version: 7 Release: 1%{?dist} Summary: RPM Macros and Utilities for Node.js Packaging BuildArch: noarch License: MIT URL: https://fedoraproject.org/wiki/Node.js/Packagers -Source0: https://fedorahosted.org/released/%{name}/%{name}-fedora-%{version}.tar.xz +Source0: https://fedorahosted.org/released/%{name}/%{name}-el6-%{version}.tar.xz +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 @@ -16,15 +17,14 @@ This package contains RPM macros and other utilities useful for packaging Node.js modules and applications in RPM-based distributions. %prep -%setup -qn %{name}-fedora-%{version} +%setup -qn %{name}-el6-%{version} %build #nothing to do %install install -Dpm0644 macros.nodejs %{buildroot}%{_sysconfdir}/rpm/macros.nodejs -install -Dpm0644 nodejs.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr -install -pm0755 nodejs.prov %{buildroot}%{_rpmconfigdir}/nodejs.prov +install -Dpm0755 nodejs.prov %{buildroot}%{_rpmconfigdir}/nodejs.prov install -pm0755 nodejs.req %{buildroot}%{_rpmconfigdir}/nodejs.req install -pm0755 nodejs-symlink-deps %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps install -pm0755 nodejs-fixdep %{buildroot}%{_rpmconfigdir}/nodejs-fixdep @@ -32,16 +32,37 @@ install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules %files %{_sysconfdir}/rpm/macros.nodejs -%{_rpmconfigdir}/fileattrs/nodejs*.attr %{_rpmconfigdir}/nodejs* %{_datadir}/node/multiver_modules %doc LICENSE %changelog +* Sun May 25 2014 T.C. Hollingsworth - 7-1 +- nodejs-symlink-deps: fix regression preventing multiply versioned modules from + being symlinked correctly + +* Sat May 24 2014 T.C. Hollingsworth - 6-1 +- nodejs-fixdep: use real option parsing +- nodejs-fixdep: support modifying optionalDependencies and devDependencies +- req: support the caret operator +- nodejs-symlink-deps: add --force option +- nodejs-symlink-deps: add --build alias for --check +- nodejs-fixdep: support converting to caret dependencies +- nodejs-fixdep: support non-dictionary dependency properties +- multiver_modules: add nan + +* Mon Jan 27 2014 T.C. Hollingsworth - 5-1 +- only look for deps in the package.json in the toplevel module dir + (RHBZ#1057703) + +* Mon Jul 29 2013 T.C. Hollingsworth - 4-1 +- handle cases where the symlink target exists gracefully + * Wed Jul 10 2013 T.C. Hollingsworth - 3-1 - dependencies and engines can be lists or strings too - handle unversioned dependencies on multiply versioned modules correctly (RHBZ#982798) +- restrict to compatible arches * Fri Jun 21 2013 T.C. Hollingsworth - 2-1 - move multiple version list to /usr/share/node diff --git a/sources b/sources index 2a82e73..8deb456 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db11ae6bd03735ac97e1329fbc82f38c nodejs-packaging-fedora-3.tar.xz +e8a0a9ebdd5f056da06cbab15dcbbc01 nodejs-packaging-el6-7.tar.xz