Commit Graph

54 Commits

Author SHA1 Message Date
Stephen Gallagher
abab55a363
Fix hard-coded output directory in the bundler
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2021-06-22 12:28:17 -04:00
Benjamin A. Beasley
fb332bd0ea In nodejs-packaging-bundler, use %{_sourcedir} for output
Fixes RHBZ#1974709
2021-06-22 07:52:40 -04:00
Benjamin A. Beasley
5385bed950 Actually use the value of OUTPUT_DIR when copying bundled sources in nodejs-packaging-bundler 2021-06-22 07:50:42 -04:00
Stephen Gallagher
bef475468a
Update to 2021.06
bundler: Handle archaic license metadata
bundler: Warn about bundled dependencies with no license metadata

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2021-06-02 14:21:55 -04:00
Stephen Gallagher
2ab3684dd6 Spec: fix line-length for rpmlint
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2021-06-02 18:17:12 +00:00
Stephen Gallagher
e7b09b6fec bundler: Add warning for deps missing license tag
Resolves: rhbz#1920223

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2021-06-02 18:17:12 +00:00
Stephen Gallagher
7aed687bf8 bundler: Handle deprecated license metadata
Adds support for archaic forms of the license metadata in
package.json where the license field is an object rather than a
string.

Also removes the need to post-process the 'null' entries.

Resolves: rhbz#1920206

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2021-06-02 18:17:12 +00:00
Stephen Gallagher
9074f546bf Fix incorrect flag for fedpkg scratch-build 2021-04-20 19:48:39 +00:00
Fedora Release Engineering
ed5219fd68 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 21:36:55 +00:00
Stephen Gallagher
a21e3d16f8
nodejs-packaging-bundler improvements to handle uncommon characters
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2021-01-20 09:19:40 -05:00
Michel Alexandre Salim
7d1699cedc
nodejs-packaging-bundler: sanitize package name
The NPM package name might contain invalid characters, e.g.
`@bitwarden/cli`.

Normalize the generated bundles by converting `/` to `-`.

```
specs/nodejs on  master
❯ ~/src/fedora/pkgs-others/nodejs-packaging/nodejs-packaging-bundler @bitwarden/cli
...
    Successful dev dependences download
'@bitwarden-cli-1.13.3-bundled-licenses.txt' -> '/home/michel/rpmbuild/SOURCES/@bitwarden-cli-1.13.3-bundled-licenses.txt'
'@bitwarden-cli-1.13.3-nm-dev.tgz' -> '/home/michel/rpmbuild/SOURCES/@bitwarden-cli-1.13.3-nm-dev.tgz'
'@bitwarden-cli-1.13.3-nm-prod.tgz' -> '/home/michel/rpmbuild/SOURCES/@bitwarden-cli-1.13.3-nm-prod.tgz'
```

Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
2021-01-18 09:39:00 -08:00
Troy Dawson
05a9e58997 Fix null when there is no .licenses found.
Signed-off-by: Troy Dawson <tdawson@redhat.com>
2021-01-11 13:54:15 -08:00
Troy Dawson
5b7b3fce5d Add nodejs-packaging-bundler file
Add nodejs-packaging-bundler subpackage in spec file
Update README.md with comments about nodejs-packaging-bundler
  and an example spec file that uses bundling

Signed-off-by: Troy Dawson <tdawson@redhat.com>
2021-01-08 09:39:42 -08:00
Stephen Gallagher
8de3f914f4 Make dist-git the upstream repo
Since the scripts and tools in this package are really Fedora
(and derivatives) specific, it doesn't really make a lot of
sense to maintain them in a separate upstream with tarball
releases.

This moves all the files into dist-git and builds the RPM from
there.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2020-09-18 15:50:14 -04:00
Stephen Gallagher
c68c968e27
Fix incorrect bundled library detection for Requires
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2020-09-02 10:52:07 -04:00
Stephen Gallagher
372df431ef
Check node_modules_prod for bundled dependencies
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2020-09-01 10:46:37 -04:00
Fedora Release Engineering
3ee96cddfd - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 10:55:05 +00:00
Stephen Gallagher
021f0badab
Drop Requires: nodejs(engine)
This is no longer needed (Fedora and EPEL are both well past 0.10
at this point). It was also incorrect to begin with. It should have
been `Conflicts: nodejs(engine) < 0.10.13` since it was only intended
to force the upgrade if it was currently installed, not to force
nodejs itself to be brought in.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2020-06-03 09:25:32 -04:00
Fedora Release Engineering
06eeb0e699 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 17:45:01 +00:00
Tom Hughes
f3e8a0485d Ensure nodejs(engine) is required for packages with no dependencies 2019-10-31 10:06:29 +00:00
Fedora Release Engineering
47235c6094 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 21:14:55 +00:00
Tom Hughes
9875fea47c Refactor nodejs.req in more idiomatic Python
Also treat only external dependency links as un-bundled.
2019-07-02 18:14:32 +01:00
Tom Hughes
0af8638afd Refactor nodejs.prov in more idiomatic Python 2019-06-10 15:33:14 +01:00
Fedora Release Engineering
82f548aa25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 15:00:05 +00:00
Tom Hughes
3b49842408 Fix handling of ^ dependencies for multiversion modules 2019-01-05 12:26:48 +00:00
Tom Hughes
d4c27e1ef4 Handle =, >= and <= dependencies for multiversion modules 2019-01-03 17:24:12 +00:00
Fedora Release Engineering
fefb4a0eae - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 13:29:19 +00:00
Tom Hughes
682ccaa773 Fix version comparators with a space after the operator 2018-05-03 08:51:04 +01:00
Tom Hughes
9983689c06 Add BR for python3 2018-05-02 01:01:02 +01:00
Tom Hughes
7428d76bde Rewrite nodejs.req to better match npm versioning rules 2018-05-02 00:47:38 +01:00
Tom Hughes
9ab0cce29a Fix caret dependency ranges 2018-04-30 20:44:41 +01:00
Tom Hughes
0f8a055f94 Only match top level modules for requires and provides generation 2018-04-12 14:01:03 +01:00
Tom Hughes
1f15ed7943 Add %nodejs_setversion macro 2018-02-28 11:30:35 +00:00
Tom Hughes
b023303eb2 Port to python 3 2018-02-23 22:24:12 +00:00
Fedora Release Engineering
e35ac626e9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 06:56:45 +00:00
Tom Hughes
d0b93300e4 nodejs-packaging-11
- nodesjs.req: use boolean with for range dependencies
2018-01-13 00:23:08 +00:00
Stephen Gallagher
79a61a71ff
Release v10
Automatically generate Provides for bundled npm dependencies

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2017-09-12 08:59:49 -04:00
Fedora Release Engineering
ab09ef0640 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 00:29:40 +00:00
Tom Hughes
037154a07e switch source URL to pagure 2017-02-21 17:39:58 +00:00
Fedora Release Engineering
de2dd7032b - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 23:36:35 +00:00
Tom Hughes
697d52f261 nodejs-packaging-9
- nodejs-fixdep: stop --move erroring on missing dependency types
2016-02-02 18:05:11 +00:00
Tom Hughes
207e477ec0 nodejs-packaging-7
- nodejs-fixdep: add --move option
- nodejs-symlink-deps: add --optional option
- req: generate suggests for optional dependencies
2016-01-31 12:14:28 +00:00
Tom Hughes
1656b7eafa nodejs-symlink-deps: handle caret in versions 2015-11-16 17:26:56 +00:00
Dennis Gilmore
eaf0c043cc - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 22:48:00 +00:00
Ville Skyttä
48ee4c2b6a Install macros in %{_rpmconfidir}/macros.d where available (#1074279) 2015-03-04 21:53:30 +02:00
Dennis Gilmore
c9bc5426a7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 09:15:13 -05:00
T.C. Hollingsworth
230030c293 respin tarball
I always forget the / at the end of the --prefix argument of 'git
archive'.  >:-(
2014-05-24 23:21:11 -07:00
T.C. Hollingsworth
958fb7231b nodejs-symlink-deps: fix regression preventing multiply versioned modules from
being symlinked correctly
2014-05-24 23:13:19 -07:00
T.C. Hollingsworth
110033bb95 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
2014-05-23 20:14:23 -07:00
T.C. Hollingsworth
7a4498574d handle cases where the symlink target exists gracefully 2013-07-29 16:46:24 -07:00