From 79da2baf9ed7fb7a0fd7af927fc20868f385d020 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 4 Dec 2014 22:00:55 +0100 Subject: [PATCH 1/2] build: update rpmbuild .spec file Rename the package to iojs. No Conflicts: header is necessary because the package was already marked as conflicting with the Fedora nodejs package. PR-URL: https://github.com/iojs/io.js/pull/71 Reviewed-By: Rod Vagg --- tools/rpm/node.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/rpm/node.spec b/tools/rpm/node.spec index 69369e31c7cfdd..ae8e85b342a84c 100644 --- a/tools/rpm/node.spec +++ b/tools/rpm/node.spec @@ -15,14 +15,14 @@ # This is updated by rpmbuild.sh. %define _version 0.10.12 -Name: node +Name: iojs Version: %{_version} Release: 1 -Summary: Node.js is a platform for building fast, scalable network applications. +Summary: io.js is a platform for building fast, scalable network applications. Group: Development/Languages License: MIT -URL: http://nodejs.org/ -Source0: http://nodejs.org/dist/v%{_version}/node-v%{_version}.tar.gz +URL: http://iojs.org/ +Source0: http://iojs.org/dist/v%{_version}/iojs-v%{_version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-devel @@ -37,10 +37,10 @@ Conflicts: nodejs %description -Node.js is a platform built on Chrome's JavaScript runtime for easily +io.js is a platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications. -Node.js uses an event-driven, non-blocking I/O model that makes it +io.js uses an event-driven, non-blocking I/O model that makes it lightweight and efficient, perfect for data-intensive real-time applications that run across distributed devices. @@ -71,10 +71,10 @@ make %{?_smp_mflags} # Use mildly hard-coded paths in the install and files targets for now. -# _libdir is /usr/lib64 on some systems but the node.js installer always -# installs to /usr/lib. I have commits sitting in a branch that add --libdir -# and --mandir configure switches to the node.js configure script but it's -# debatable if it's worth the extra complexity. +# _libdir is /usr/lib64 on some systems but the installer always installs +# to /usr/lib. I have commits sitting in a branch that add --libdir and +# --mandir configure switches to the configure script but it's debatable +# if it's worth the extra complexity. %install export DONT_STRIP=1 # Don't strip debug symbols for now. make install DESTDIR=%{buildroot} @@ -100,5 +100,8 @@ done %changelog +* Thu Dec 4 2014 Ben Noordhuis +- Rename to iojs. + * Fri Jul 5 2013 Ben Noordhuis - Initial release. From 993fadb1f2e116180c9149a7b844bf39a6cf1819 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 4 Dec 2014 22:02:51 +0100 Subject: [PATCH 2/2] build: rename rpmbuild .spec file Rename the .spec file from node.spec to iojs.spec and update the build script. Done as a separate commit to not obscure the changes from the previous commit. PR-URL: https://github.com/iojs/io.js/pull/71 Reviewed-By: Rod Vagg --- tools/rpm/{node.spec => iojs.spec} | 0 tools/rpm/rpmbuild.sh | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename tools/rpm/{node.spec => iojs.spec} (100%) diff --git a/tools/rpm/node.spec b/tools/rpm/iojs.spec similarity index 100% rename from tools/rpm/node.spec rename to tools/rpm/iojs.spec diff --git a/tools/rpm/rpmbuild.sh b/tools/rpm/rpmbuild.sh index 6f2d0d123be2b2..3f3643b8b78ade 100755 --- a/tools/rpm/rpmbuild.sh +++ b/tools/rpm/rpmbuild.sh @@ -38,7 +38,7 @@ fi set -x sed -re "s/%define _version .+/%define _version ${VERSION}/" \ - "$TOOLSDIR/node.spec" > $RPMBUILD_PATH/SPECS/node.spec -tar --exclude-vcs --transform="s|^|node-${VERSION}/|" \ - -czf $RPMBUILD_PATH/SOURCES/node-v${VERSION}.tar.gz . -rpmbuild $* -ba $RPMBUILD_PATH/SPECS/node.spec + "$TOOLSDIR/iojs.spec" > $RPMBUILD_PATH/SPECS/iojs.spec +tar --exclude-vcs --transform="s|^|iojs-${VERSION}/|" \ + -czf $RPMBUILD_PATH/SOURCES/iojs-v${VERSION}.tar.gz . +rpmbuild $* -ba $RPMBUILD_PATH/SPECS/iojs.spec