From 5b5ad5f06ccda1ff118367bee1c95e392130e3f0 Mon Sep 17 00:00:00 2001 From: Stuart D. Gathman Date: May 22 2020 14:42:54 +0000 Subject: New upstream release 1.1.0 --- diff --git a/.gitignore b/.gitignore index 864ac3b..cb06729 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /tests-v0.2.9.tar.bz2 /marked-0.3.2.tgz /tests-v0.3.2.tar.bz2 +/marked-1.1.0.tar.gz diff --git a/dl-tests.sh b/dl-tests.sh deleted file mode 100644 index 6e4a015..0000000 --- a/dl-tests.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -tag=v0.3.2 - -set -e - -tmp=$(mktemp -d) - -trap cleanup EXIT -cleanup() { - set +e - [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" -} - -unset CDPATH -pwd=$(pwd) - -pushd "$tmp" -git clone git://github.com/chjj/marked.git -cd marked -git archive --prefix="test/" --format=tar tags/${tag}:test/ \ - | bzip2 > "$pwd"/tests-${tag}.tar.bz2 -popd diff --git a/marked.spec b/marked.spec index daa13aa..abfd380 100644 --- a/marked.spec +++ b/marked.spec @@ -3,17 +3,12 @@ %global enable_tests 0 Name: marked -Version: 0.3.2 -Release: 12%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: A markdown parser for Node.js built for speed License: MIT -URL: https://github.com/chjj/marked -Source0: http://registry.npmjs.org/marked/-/marked-%{version}.tgz -# The test files are not included in the npm tarball. -# Source1 is generated by running Source10, which pulls from the upstream -# version control repository. -Source1: tests-v%{version}.tar.bz2 -Source10: dl-tests.sh +URL: https://github.com/markedjs/%{name} +Source0: https://github.com/markedjs/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch %if 0%{?fedora} >= 19 @@ -27,79 +22,71 @@ BuildRequires: web-assets-devel BuildRequires: uglify-js %if 0%{?enable_tests} -BuildRequires: npm(express) +BuildRequires: jasmine +BuildRequires: npm +#BuildRequires: npm(express) BuildRequires: npm(markdown) BuildRequires: npm(showdown) # Not yet packaged for Fedora. # BuildRequires: npm(robotskirt) %endif -Requires: js-marked = %{version}-%{release} - -%description -marked is a full-featured markdown compiler that can parse huge chunks of -markdown without having to worry about caching the compiled output or -blocking for an unnecessarily long time. - -marked is extremely fast and frequently outperforms similar markdown parsers. -marked is very concise and still implements all markdown features, as well -as GitHub Flavored Markdown features. - -marked more or less passes the official markdown test suite in its entirety. -This is important because a surprising number of markdown compilers cannot +Requires: nodejs-marked = %{version}-%{release} + +%global _description\ +marked is a full-featured markdown compiler that can parse huge chunks of\ +markdown without having to worry about caching the compiled output or\ +blocking for an unnecessarily long time.\ +\ +marked is extremely fast and frequently outperforms similar markdown parsers.\ +marked is very concise and still implements all markdown features, as well\ +as GitHub Flavored Markdown features.\ +\ +marked more or less passes the official markdown test suite in its entirety.\ +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. +%_description -%package -n js-marked +%package -n nodejs-marked Summary: A markdown parser for JavaScript built for speed Requires: web-assets-filesystem +# For compatibility +Provides: js-marked -%description -n js-marked -marked is a full-featured markdown compiler that can parse huge chunks of -markdown without having to worry about caching the compiled output or -blocking for an unnecessarily long time. - -marked is extremely fast and frequently outperforms similar markdown parsers. -marked is very concise and still implements all markdown features, as well -as GitHub Flavored Markdown features. - -marked more or less passes the official markdown test suite in its entirety. -This is important because a surprising number of markdown compilers cannot -pass more than a few tests. - +%description -n nodejs-marked %_description %prep -%setup -q -n package -%setup -q -T -D -a 1 -n package +%setup -q -n %{name}-%{version} # remove the bundled minified marked rm -f marked.min.js - %build uglifyjs --comments '/Copyright/' lib/marked.js -o marked.min.js - %install -mkdir -p %{buildroot}%{_jsdir}/marked -cp -pr lib/marked.js marked.min.js %{buildroot}%{_jsdir}/marked +mkdir -p %{buildroot}%{_jsdir}/%{name} +cp -pr lib/marked.js marked.min.js %{buildroot}%{_jsdir}/%{name} -mkdir -p %{buildroot}%{nodejs_sitelib}/marked -cp -pr package.json component.json \ - %{buildroot}%{nodejs_sitelib}/marked -mkdir -p %{buildroot}%{nodejs_sitelib}/marked/lib +mkdir -p %{buildroot}%{nodejs_sitelib}/%{name} +cp -pr package.json component.json src \ + %{buildroot}%{nodejs_sitelib}/%{name} +mkdir -p %{buildroot}%{nodejs_sitelib}/%{name}/lib ln -sf %{_jsdir}/marked/marked.js \ %{buildroot}%{nodejs_sitelib}/marked/lib/marked.js -mkdir -p %{buildroot}%{nodejs_sitelib}/marked/bin -install -p -D -m0755 bin/marked \ - %{buildroot}%{nodejs_sitelib}/marked/bin/marked +mkdir -p %{buildroot}%{nodejs_sitelib}/%{name}/bin +install -p -D -m0755 bin/%{name} \ + %{buildroot}%{nodejs_sitelib}/marked/bin/%{name} mkdir -p %{buildroot}/%{_bindir} -ln -sf %{nodejs_sitelib}/marked/bin/marked \ - %{buildroot}%{_bindir}/marked +ln -sf %{nodejs_sitelib}/%{name}/bin/%{name} \ + %{buildroot}%{_bindir}/%{name} mkdir -p %{buildroot}%{_mandir}/man1 -install -p -D -m0644 man/marked.1 \ - %{buildroot}%{_mandir}/man1/marked.1 +install -p -D -m0644 man/%{name}.1 \ + %{buildroot}%{_mandir}/man1/%{name}.1 %nodejs_symlink_deps @@ -114,21 +101,26 @@ install -p -D -m0644 man/marked.1 \ %nodejs_symlink_deps --check # /usr/bin/npm install robotskirt -%__nodejs ./test/ +#__nodejs ./test/ +npm run test %endif %files -%{nodejs_sitelib}/marked -%{_bindir}/marked -%{_mandir}/man1/marked.1* +%{nodejs_sitelib}/%{name} +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* -%files -n js-marked -%doc LICENSE README.md doc/ -%{_jsdir}/marked +%files -n nodejs-%{name} +%license LICENSE.md +%doc README.md docs +%{_jsdir}/%{name} %changelog +* Thu May 21 2020 Stuart Gathman - 1.1.0-1 +- New upstream release + * Wed Jan 29 2020 Fedora Release Engineering - 0.3.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index f993c12..9b19a23 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -bcab6f85bf74e63513a279e598a248d4 marked-0.3.2.tgz -927f2c52b5952d5363e94f66e7932798 tests-v0.3.2.tar.bz2 +SHA512 (marked-1.1.0.tar.gz) = 500e174d55960a57ee63b814d747535dbeef500c2b97fd2f82fdf18f01df3ee8079295b9f19ebbdcd6749b5f3db93af6815e5a8008b7efa4f7a7a75c7b1f6c75