diff --git a/.gitignore b/.gitignore index bca2cc1..7235b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ /express-3.3.3.tgz /tests-3.3.1.tar.bz2 /express-3.3.5.tgz +/examples-3.5.0.tar.bz2 +/express-3.5.0.tgz +/tests-3.5.0.tar.bz2 diff --git a/dl-tests.sh b/dl-tests.sh index de845b3..ece9cc7 100644 --- a/dl-tests.sh +++ b/dl-tests.sh @@ -1,6 +1,6 @@ #!/bin/bash -tag=3.3.5 +tag=3.5.0 set -e @@ -20,4 +20,6 @@ git clone git://github.com/visionmedia/express.git cd express git archive --prefix="test/" --format=tar tags/${tag}:test/ \ | bzip2 > "$pwd"/tests-${tag}.tar.bz2 +git archive --prefix="examples/" --format=tar tags/${tag}:examples/ \ + | bzip2 > "$pwd"/examples-${tag}.tar.bz2 popd diff --git a/express.1 b/express.1 deleted file mode 100644 index 58d92c3..0000000 --- a/express.1 +++ /dev/null @@ -1,50 +0,0 @@ -.TH EXPRESS "1" "March 2013" "express 3.1.0" "User Commands" -.SH NAME -express \- Sinatra inspired web development framework -.SH SYNOPSIS -Usage: express [options] -.SH DESCRIPTION -This Node.js module is a fast, unopinionated, minimalist web development -framework inspired by Sinatra. - -The Express philosophy is to provide small, robust tooling for HTTP servers. -Making it a great solution for single page applications, web sites, hybrids, -or public HTTP APIs. - -Built on Connect you can use only what you need, and nothing more, -applications can be as big or as small as you like, even a single file. -Express does not force you to use any specific ORM or template engine. With -support for over 14 template engines via Consolidate.js you can quickly craft -your perfect framework. -.SH OPTIONS -.TP -\fB\-h\fR, \fB\-\-help\fR -output usage information -.TP -\fB\-V\fR, \fB\-\-version\fR -output the version number -.TP -\fB\-s\fR, \fB\-\-sessions\fR -add session support -.TP -\fB\-e\fR, \fB\-\-ejs\fR -add ejs engine support (defaults to jade) -.TP -\fB\-J\fR, \fB\-\-jshtml\fR -add jshtml engine support (defaults to jade) -.TP -\fB\-H\fR, \fB\-\-hogan\fR -add hogan.js engine support -.TP -\fB\-c\fR, \fB\-\-css\fR -add stylesheet support (less|stylus) (defaults to plain css) -.TP -\fB\-f\fR, \fB\-\-force\fR -force on non\-empty directory -.SH AUTHORS -The main author of expresso is TJ Holowaychuk <\fBtj@vision-media.ca\fR>. -For a more complete list of contributors, see the GitHub page at -<\fBhttps://github.com/visionmedia/express\fR> -.SH REPORTING BUGS -Please report bugs on the GitHub issue tracker: -<\fBhttps://github.com/visionmedia/express/issues\fR> diff --git a/nodejs-express.spec b/nodejs-express.spec index 95c60f8..3d7308d 100644 --- a/nodejs-express.spec +++ b/nodejs-express.spec @@ -3,7 +3,7 @@ %global enable_tests 0 Name: nodejs-express -Version: 3.3.5 +Version: 3.5.0 Release: 1%{?dist} Summary: Sinatra inspired web development framework for Node.js License: MIT @@ -13,11 +13,9 @@ Source0: http://registry.npmjs.org/express/-/express-%{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-3.3.1.tar.bz2 +Source1: tests-%{version}.tar.bz2 +Source2: examples-%{version}.tar.bz2 Source10: dl-tests.sh -# Pull request sent upstream: -# https://github.com/visionmedia/express/pull/1545 -Source20: express.1 BuildArch: noarch %if 0%{?fedora} >= 19 @@ -29,25 +27,30 @@ ExclusiveArch: %{ix86} x86_64 %{arm} noarch BuildRequires: nodejs-packaging %if 0%{?enable_tests} +BuildRequires: mocha BuildRequires: npm(buffer-crc32) BuildRequires: npm(commander) BuildRequires: npm(connect) BuildRequires: npm(cookie) BuildRequires: npm(cookie-signature) BuildRequires: npm(debug) +BuildRequires: npm(ejs) BuildRequires: npm(fresh) BuildRequires: npm(jade) +BuildRequires: npm(marked) +BuildRequires: npm(merge-descriptors) BuildRequires: npm(methods) -BuildRequires: npm(mocha) +BuildRequires: npm(mkdirp) BuildRequires: npm(range-parser) BuildRequires: npm(send) BuildRequires: npm(should) +BuildRequires: npm(stylus) BuildRequires: npm(supertest) %endif %description -This Node.js module is a fast, unopinionated, minimalist web development -framework inspired by Sinatra. +This Node.js module is a fast, minimalist web development framework inspired +by Sinatra. The Express philosophy is to provide small, robust tooling for HTTP servers. Making it a great solution for single page applications, web sites, hybrids, @@ -63,6 +66,8 @@ your perfect framework. %prep %setup -q -n package %setup -q -T -D -a 1 -n package +%setup -q -T -D -a 2 -n package +%nodejs_fixdep commander '>=1.3.2' %nodejs_fixdep mkdirp '~0.3.5' @@ -78,10 +83,8 @@ mkdir -p %{buildroot}%{nodejs_sitelib}/express/bin install -p -D -m0755 bin/express \ %{buildroot}%{nodejs_sitelib}/express/bin/express mkdir -p %{buildroot}%{_bindir} -ln -s %{nodejs_sitelib}/express/bin/express %{buildroot}%{_bindir}/express - -mkdir -p %{buildroot}%{_mandir}/man1 -install -p -D -m0644 %{SOURCE20} %{buildroot}%{_mandir}/man1/express.1 +ln -s %{nodejs_sitelib}/express/bin/express \ + %{buildroot}%{_bindir}/express %nodejs_symlink_deps @@ -90,20 +93,23 @@ install -p -D -m0644 %{SOURCE20} %{buildroot}%{_mandir}/man1/express.1 %check %nodejs_symlink_deps --check rm -f test.js -NODE_ENV=test %{nodejs_sitelib}/mocha/bin/mocha --reporter dot +NODE_ENV=test /usr/bin/mocha --reporter dot \ + --globals setImmediate,clearImmediate --check-leaks NODE_ENV=test %{nodejs_sitelib}/mocha/bin/mocha --reporter dot --bail \ test/acceptance/*.js %endif %files -%doc History.md LICENSE Readme.md +%doc History.md LICENSE Readme.md examples/ %{nodejs_sitelib}/express %{_bindir}/express -%{_mandir}/man1/express.1* %changelog +* Sat Mar 08 2014 Jamie Nguyen - 3.5.0-1 +- update to upstream release 3.5.0 + * Mon Aug 26 2013 Jamie Nguyen - 3.3.5-1 - update to upstream release 3.3.5 - add ExclusiveArch logic diff --git a/sources b/sources index 0b4e466..9f5f34f 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -9abb89fd74b67c3431a73030e2d02eef express-3.3.5.tgz -4ea6a9065bdfbe216338344f15f4cffe tests-3.3.1.tar.bz2 +b8c0055f5ad76a7007a21badf3bcdf88 examples-3.5.0.tar.bz2 +03417194b5753b04593e20ca761abc5c express-3.5.0.tgz +342f8ef718aeaa92d458261da5161abc tests-3.5.0.tar.bz2