Compare commits

...
Sign in to create a new pull request.

12 commits

Author SHA1 Message Date
T.C. Hollingsworth
5286c5dff7 respin tarball 2014-05-24 23:22:26 -07:00
T.C. Hollingsworth
3541d798d4 nodejs-symlink-deps: fix regression preventing multiply versioned modules from
being symlinked correctly
2014-05-24 23:12:57 -07:00
T.C. Hollingsworth
484715f58d 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 110033bb95)

Conflicts:
	.gitignore
	nodejs-packaging.spec
	sources
2014-05-23 20:21:08 -07:00
T.C. Hollingsworth
a6a81791c2 fix broken tarball 2014-01-27 13:30:10 -07:00
T.C. Hollingsworth
1ed48a58e7 only look for deps in the package.json in the toplevel module dir
(RHBZ#1057703)
2014-01-27 13:20:16 -07:00
T.C. Hollingsworth
2d79629f14 handle cases where the symlink target exists gracefully 2013-07-29 16:45:54 -07:00
T.C. Hollingsworth
8290f50dac ensure %{_rpmconfigdir} is created in the buildroot 2013-07-10 04:28:28 -07:00
T.C. Hollingsworth
5341266b99 drop it from %files too
*sighs*
2013-07-10 04:22:32 -07:00
T.C. Hollingsworth
07f8796256 fileattrs doesn't exist on el6 2013-07-10 04:17:14 -07:00
T.C. Hollingsworth
0f8c1b8b64 fix branch in %setup too 2013-07-10 04:05:43 -07:00
T.C. Hollingsworth
b3dd6c94c2 switch to el6 upstream branch 2013-07-10 03:54:36 -07:00
T.C. Hollingsworth
4f4dada80a restrict to compatible arches 2013-07-10 03:53:37 -07:00
3 changed files with 34 additions and 7 deletions

6
.gitignore vendored
View file

@ -1,2 +1,8 @@
/nodejs-packaging-fedora-2.tar.xz /nodejs-packaging-fedora-2.tar.xz
/nodejs-packaging-fedora-3.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

View file

@ -1,11 +1,12 @@
Name: nodejs-packaging Name: nodejs-packaging
Version: 3 Version: 7
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM Macros and Utilities for Node.js Packaging Summary: RPM Macros and Utilities for Node.js Packaging
BuildArch: noarch BuildArch: noarch
License: MIT License: MIT
URL: https://fedoraproject.org/wiki/Node.js/Packagers 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 #nodejs-devel before 0.10.12 provided these macros and owned /usr/share/node
Requires: nodejs(engine) >= 0.10.12 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. Node.js modules and applications in RPM-based distributions.
%prep %prep
%setup -qn %{name}-fedora-%{version} %setup -qn %{name}-el6-%{version}
%build %build
#nothing to do #nothing to do
%install %install
install -Dpm0644 macros.nodejs %{buildroot}%{_sysconfdir}/rpm/macros.nodejs install -Dpm0644 macros.nodejs %{buildroot}%{_sysconfdir}/rpm/macros.nodejs
install -Dpm0644 nodejs.attr %{buildroot}%{_rpmconfigdir}/fileattrs/nodejs.attr install -Dpm0755 nodejs.prov %{buildroot}%{_rpmconfigdir}/nodejs.prov
install -pm0755 nodejs.prov %{buildroot}%{_rpmconfigdir}/nodejs.prov
install -pm0755 nodejs.req %{buildroot}%{_rpmconfigdir}/nodejs.req install -pm0755 nodejs.req %{buildroot}%{_rpmconfigdir}/nodejs.req
install -pm0755 nodejs-symlink-deps %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps install -pm0755 nodejs-symlink-deps %{buildroot}%{_rpmconfigdir}/nodejs-symlink-deps
install -pm0755 nodejs-fixdep %{buildroot}%{_rpmconfigdir}/nodejs-fixdep install -pm0755 nodejs-fixdep %{buildroot}%{_rpmconfigdir}/nodejs-fixdep
@ -32,16 +32,37 @@ install -Dpm0644 multiver_modules %{buildroot}%{_datadir}/node/multiver_modules
%files %files
%{_sysconfdir}/rpm/macros.nodejs %{_sysconfdir}/rpm/macros.nodejs
%{_rpmconfigdir}/fileattrs/nodejs*.attr
%{_rpmconfigdir}/nodejs* %{_rpmconfigdir}/nodejs*
%{_datadir}/node/multiver_modules %{_datadir}/node/multiver_modules
%doc LICENSE %doc LICENSE
%changelog %changelog
* Sun May 25 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 7-1
- nodejs-symlink-deps: fix regression preventing multiply versioned modules from
being symlinked correctly
* Sat May 24 2014 T.C. Hollingsworth <tchollingsworth@gmail.com> - 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 <tchollingsworth@gmail.com> - 5-1
- only look for deps in the package.json in the toplevel module dir
(RHBZ#1057703)
* Mon Jul 29 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 4-1
- handle cases where the symlink target exists gracefully
* Wed Jul 10 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 3-1 * Wed Jul 10 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 3-1
- dependencies and engines can be lists or strings too - dependencies and engines can be lists or strings too
- handle unversioned dependencies on multiply versioned modules correctly - handle unversioned dependencies on multiply versioned modules correctly
(RHBZ#982798) (RHBZ#982798)
- restrict to compatible arches
* Fri Jun 21 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 2-1 * Fri Jun 21 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 2-1
- move multiple version list to /usr/share/node - move multiple version list to /usr/share/node

View file

@ -1 +1 @@
db11ae6bd03735ac97e1329fbc82f38c nodejs-packaging-fedora-3.tar.xz e8a0a9ebdd5f056da06cbab15dcbbc01 nodejs-packaging-el6-7.tar.xz