diff --git a/marked.spec b/marked.spec index b148a7e..e92001c 100644 --- a/marked.spec +++ b/marked.spec @@ -47,22 +47,35 @@ This is important because a surprising number of markdown compilers cannot\ pass more than a few tests. %description -Install this for the command line tool and man page for nodejs-marked. +Install this for command line tool and man page. %_description +# Note: the subpackages were the only way I could get upgrades +# from marked-0.3.2 or nodejs-marked-0.3.6 to work smoothly. + %package -n nodejs-marked Summary: A markdown parser for JavaScript built for speed Requires: web-assets-filesystem -# For compatibility -Provides: js-marked=%{version} +# For symlink in %%{nodejs_sitelib}/%%{name}/lib +Requires: js-marked = %{version}-%{release} %description -n nodejs-marked %_description +%package -n js-marked +Summary: Minified markdown parser for JavaScript built for speed +Requires: web-assets-filesystem + +%description -n js-marked +Install this for the minified web assests for nodejs-marked. +%_description + %prep %setup -q -n %{name}-%{version} # remove the bundled minified marked rm -f marked.min.js +# Not sure what this is for, but rpmlint doesn't like it +rm -f docs/.eslintrc.json %build uglifyjs --comments '/Copyright/' lib/marked.js -o marked.min.js @@ -117,11 +130,16 @@ npm run test %license LICENSE.md %doc README.md docs %{nodejs_sitelib}/%{name} + + +%files -n js-%{name} +%license LICENSE.md %{_jsdir}/%{name} + %changelog * Fri May 22 2020 Stuart Gathman - 1.1.0-3 -- Specify version on js-marked Provides +- Move web assets to js-marked * Fri May 22 2020 Stuart Gathman - 1.1.0-2 - Move module files to nodejs-marked