From 4f4dada80a31be94319cb0d7902e983c1ef551d5 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 10 Jul 2013 03:53:37 -0700 Subject: [PATCH 01/12] restrict to compatible arches --- nodejs-packaging.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index bcc4151..f2289ae 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -6,6 +6,7 @@ BuildArch: noarch License: MIT URL: https://fedoraproject.org/wiki/Node.js/Packagers Source0: https://fedorahosted.org/released/%{name}/%{name}-fedora-%{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 @@ -42,6 +43,7 @@ install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules - 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 From b3dd6c94c22e8d2348143ac86079d03bb397ca63 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 10 Jul 2013 03:54:36 -0700 Subject: [PATCH 02/12] switch to el6 upstream branch --- .gitignore | 1 + nodejs-packaging.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 500d525..2e53d2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /nodejs-packaging-fedora-2.tar.xz /nodejs-packaging-fedora-3.tar.xz +/nodejs-packaging-el6-3.tar.xz diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index f2289ae..456dd97 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -5,7 +5,7 @@ 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 diff --git a/sources b/sources index 2a82e73..f56ebb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db11ae6bd03735ac97e1329fbc82f38c nodejs-packaging-fedora-3.tar.xz +8bce9cb8f0352903645b2fc254a06ee4 nodejs-packaging-el6-3.tar.xz From 0f8c1b8b648dc5521c5a68ba0795a73bfdb44ad3 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 10 Jul 2013 04:05:43 -0700 Subject: [PATCH 03/12] fix branch in %setup too --- nodejs-packaging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index 456dd97..c02c30e 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -17,7 +17,7 @@ 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 From 07f8796256d1a0ef67e646dadd3f8037f52de7ab Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 10 Jul 2013 04:17:14 -0700 Subject: [PATCH 04/12] fileattrs doesn't exist on el6 --- nodejs-packaging.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index c02c30e..351634e 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -24,7 +24,6 @@ Node.js modules and applications in RPM-based distributions. %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 -pm0755 nodejs.req %{buildroot}%{_rpmconfigdir}/nodejs.req install -pm0755 nodejs-symlink-deps %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps From 5341266b99c9b7fceb0fd5dbd3ca690cbf35c9d4 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 10 Jul 2013 04:22:32 -0700 Subject: [PATCH 05/12] drop it from %files too *sighs* --- nodejs-packaging.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index 351634e..00ea239 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -32,7 +32,6 @@ 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 From 8290f50dac4bc34a13a7f73c8c2fb417ebbf9bb2 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Wed, 10 Jul 2013 04:28:28 -0700 Subject: [PATCH 06/12] ensure %{_rpmconfigdir} is created in the buildroot --- nodejs-packaging.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index 00ea239..f2b4630 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -24,7 +24,7 @@ Node.js modules and applications in RPM-based distributions. %install install -Dpm0644 macros.nodejs %{buildroot}%{_sysconfdir}/rpm/macros.nodejs -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 From 2d79629f147330b2ceb9fee631b9196c063da29e Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Mon, 29 Jul 2013 16:42:17 -0700 Subject: [PATCH 07/12] handle cases where the symlink target exists gracefully --- .gitignore | 2 ++ nodejs-packaging.spec | 5 ++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2e53d2f..04e5bb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /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 diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index f2b4630..dc9ad98 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -1,5 +1,5 @@ Name: nodejs-packaging -Version: 3 +Version: 4 Release: 1%{?dist} Summary: RPM Macros and Utilities for Node.js Packaging BuildArch: noarch @@ -37,6 +37,9 @@ install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules %doc LICENSE %changelog +* 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 diff --git a/sources b/sources index f56ebb3..118e22c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bce9cb8f0352903645b2fc254a06ee4 nodejs-packaging-el6-3.tar.xz +687514d92896502465486cf2c7c8b0ed nodejs-packaging-el6-4.tar.xz From 1ed48a58e7c721007ece831e64beb656fbfd4f16 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Mon, 27 Jan 2014 13:20:16 -0700 Subject: [PATCH 08/12] only look for deps in the package.json in the toplevel module dir (RHBZ#1057703) --- .gitignore | 1 + nodejs-packaging.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 04e5bb5..cf13253 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /nodejs-packaging-el6-3.tar.xz /nodejs-packaging.spec /nodejs-packaging-el6-4.tar.xz +/nodejs-packaging-el6-5.tar.xz diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index dc9ad98..8f6f1e7 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -1,5 +1,5 @@ Name: nodejs-packaging -Version: 4 +Version: 5 Release: 1%{?dist} Summary: RPM Macros and Utilities for Node.js Packaging BuildArch: noarch @@ -37,6 +37,10 @@ install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules %doc LICENSE %changelog +* 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 diff --git a/sources b/sources index 118e22c..d7a0f82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -687514d92896502465486cf2c7c8b0ed nodejs-packaging-el6-4.tar.xz +ad55a63cd5e064b4996ec2fb25ab9b37 nodejs-packaging-el6-5.tar.xz From a6a81791c239efc74c59f2bef45be5286252b2d8 Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Mon, 27 Jan 2014 13:30:10 -0700 Subject: [PATCH 09/12] fix broken tarball --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index d7a0f82..55b3f35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad55a63cd5e064b4996ec2fb25ab9b37 nodejs-packaging-el6-5.tar.xz +c499888c0cced72981bba3313fec8901 nodejs-packaging-el6-5.tar.xz From 484715f58d9ad7a9960719adc9527fa44cfc9f9e Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Fri, 23 May 2014 20:14:14 -0700 Subject: [PATCH 10/12] nodejs-packaging-6 - 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 (cherry picked from commit 110033bb950af328e58310d59e13ba3d3d6d6eef) Conflicts: .gitignore nodejs-packaging.spec sources --- .gitignore | 1 + nodejs-packaging.spec | 12 +++++++++++- sources | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cf13253..5f44279 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /nodejs-packaging.spec /nodejs-packaging-el6-4.tar.xz /nodejs-packaging-el6-5.tar.xz +/nodejs-packaging-el6-6.tar.xz diff --git a/nodejs-packaging.spec b/nodejs-packaging.spec index 8f6f1e7..f58be49 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -1,5 +1,5 @@ Name: nodejs-packaging -Version: 5 +Version: 6 Release: 1%{?dist} Summary: RPM Macros and Utilities for Node.js Packaging BuildArch: noarch @@ -37,6 +37,16 @@ install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules %doc LICENSE %changelog +* 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) diff --git a/sources b/sources index 55b3f35..1ab9dd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c499888c0cced72981bba3313fec8901 nodejs-packaging-el6-5.tar.xz +7eed274b1ddc555268563adb151f58aa nodejs-packaging-el6-6.tar.xz From 3541d798d4281f37fe08e8e628356dbae19868aa Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Sat, 24 May 2014 23:11:59 -0700 Subject: [PATCH 11/12] nodejs-symlink-deps: fix regression preventing multiply versioned modules from being symlinked correctly --- .gitignore | 1 + nodejs-packaging.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5f44279..9d5d0ce 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /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 f58be49..bacb5ac 100644 --- a/nodejs-packaging.spec +++ b/nodejs-packaging.spec @@ -1,5 +1,5 @@ Name: nodejs-packaging -Version: 6 +Version: 7 Release: 1%{?dist} Summary: RPM Macros and Utilities for Node.js Packaging BuildArch: noarch @@ -37,6 +37,10 @@ install -Dpm0644 multiver_modules %{buildroot}%{_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 diff --git a/sources b/sources index 1ab9dd6..5c3725c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7eed274b1ddc555268563adb151f58aa nodejs-packaging-el6-6.tar.xz +44ea93b7c92885f04913b817ff0fbf51 nodejs-packaging-el6-7.tar.xz From 5286c5dff75782d7507939c3ec56d4c12ecf878b Mon Sep 17 00:00:00 2001 From: "T.C. Hollingsworth" Date: Sat, 24 May 2014 23:22:26 -0700 Subject: [PATCH 12/12] respin tarball --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 5c3725c..8deb456 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44ea93b7c92885f04913b817ff0fbf51 nodejs-packaging-el6-7.tar.xz +e8a0a9ebdd5f056da06cbab15dcbbc01 nodejs-packaging-el6-7.tar.xz