packages: nodejs/nodejs-soname.patch, nodejs/nodejs.spec, nodejs/nodejs-sha...

[aredridel]

Author: aredridel                    Date: Thu Mar  3 05:44:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.4.2

---- Files affected:
packages/nodejs:
   nodejs-soname.patch (1.1 -> 1.2) , nodejs.spec (1.16 -> 1.17) , nodejs-sharedlib.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/nodejs/nodejs-soname.patch
diff -u packages/nodejs/nodejs-soname.patch:1.1 packages/nodejs/nodejs-soname.patch:1.2
--- packages/nodejs/nodejs-soname.patch:1.1	Mon Feb 21 19:50:16 2011
+++ packages/nodejs/nodejs-soname.patch	Thu Mar  3 06:44:50 2011
@@ -1,12 +1,25 @@
-diff --git a/wscript b/wscript
-index de5ee45..c14a5d6 100644
---- a/wscript
-+++ b/wscript
-@@ -761,6 +761,7 @@ def build(bld):
+diff -ur node-v0.4.2-o/wscript node-v0.4.2/wscript
+--- node-v0.4.2-o/wscript	2011-03-02 22:30:21.000000000 -0700
++++ node-v0.4.2/wscript	2011-03-02 22:32:27.000000000 -0700
+@@ -779,6 +779,7 @@
    node.add_objects = 'eio http_parser'
    if product_type_is_lib:
-     node.install_path = '${PREFIX}/lib'
+     node.install_path = '${LIBDIR}'
 +    node.vnum = "4.0.0" # FIXME: Should probably be based on VERSION
    else:
      node.install_path = '${PREFIX}/bin'
    node.chmod = 0755
+diff -ur node-v0.4.2-o/wscript.orig node-v0.4.2/wscript.orig
+--- node-v0.4.2-o/wscript.orig	2011-03-02 22:24:17.000000000 -0700
++++ node-v0.4.2/wscript.orig	2011-03-02 22:30:21.000000000 -0700
+@@ -436,7 +436,6 @@
+   # LFS
+   conf.env.append_value('CPPFLAGS',  '-D_LARGEFILE_SOURCE')
+   conf.env.append_value('CPPFLAGS',  '-D_FILE_OFFSET_BITS=64')
+-  conf.env.append_value('CPPFLAGS',  '-DEV_MULTIPLICITY=0')
+ 
+   # Makes select on windows support more than 64 FDs
+   if sys.platform.startswith("win32"):
+Only in node-v0.4.2: wscript.rej
+Only in node-v0.4.2: wscript.rej~
+Only in node-v0.4.2: wscript~

================================================================
Index: packages/nodejs/nodejs.spec
diff -u packages/nodejs/nodejs.spec:1.16 packages/nodejs/nodejs.spec:1.17
--- packages/nodejs/nodejs.spec:1.16	Mon Feb 21 19:51:05 2011
+++ packages/nodejs/nodejs.spec	Thu Mar  3 06:44:50 2011
@@ -2,17 +2,15 @@
 
 Summary:	Asynchronous JavaScript Engine
 Name:		nodejs
-Version:	0.4.1
+Version:	0.4.2
 Release:	0
 License:	BSD
 Group:		Libraries
 URL:		http://nodejs.org/
 Source0:	http://nodejs.org/dist/node-v%{version}.tar.gz
-# Source0-md5:	9566bdbd05c18cc2bbe1fa0fba60dd0a
+# Source0-md5:	de4754e23bb382172bc3bbbc288fb884
 Patch0:		%{name}-ev-multiplicity.patch
-Patch1:		%{name}-sharedlib.patch
 Patch2:		%{name}-soname.patch
-Patch3:		%{name}-libdir.patch
 BuildRequires:	c-ares-devel
 BuildRequires:	c-ares-devel >= 1.7.4
 BuildRequires:	gcc >= 5:4.0
@@ -26,6 +24,8 @@
 ExclusiveArch:	%{ix86} %{x8664} arm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define _plainlibdir %{_prefix}/lib
+
 %description
 Node's goal is to provide an easy way to build scalable network
 programs. In the above example, the two second delay does not prevent
@@ -48,9 +48,7 @@
 %prep
 %setup -q -n node-v%{version}
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
-%patch3 -p0
 
 %build
 # build library
@@ -81,7 +79,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}/node/libraries,%{_libdir}/waf/wafadmin/Tools}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}/node/libraries,%{_plainlibdir}/waf/wafadmin/Tools}
 
 export PYTHONPATH=tools
 %waf install \
@@ -91,7 +89,7 @@
 install node $RPM_BUILD_ROOT%{_bindir}/node
 
 cp -a lib/*.js $RPM_BUILD_ROOT%{_libdir}/node/libraries
-cp tools/wafadmin/Tools/node_addon.py $RPM_BUILD_ROOT%{_libdir}/waf/wafadmin/Tools
+cp tools/wafadmin/Tools/node_addon.py $RPM_BUILD_ROOT%{_plainlibdir}/waf/wafadmin/Tools
 
 rm $RPM_BUILD_ROOT%{_bindir}/node-waf
 # ? really required?
@@ -118,7 +116,7 @@
 %{_includedir}/node
 %attr(755,root,root) %{_bindir}/node-waf
 %{_libdir}/libnode.so
-%{_libdir}/waf/wafadmin/Tools/node_addon.py
+%{_plainlibdir}/waf/wafadmin/Tools/node_addon.py
 %{_libdir}/pkgconfig/nodejs.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -127,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2011/03/03 05:44:50  aredridel
+- 0.4.2
+
 Revision 1.16  2011/02/21 18:51:05  aredridel
 - Build as shared library and install properly in lib64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nodejs/nodejs-soname.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nodejs/nodejs.spec?r1=1.16&r2=1.17&f=u