Author: aredridel Date: Mon Feb 21 18:51:10 2011 GMT Module: packages Tag: HEAD ---- Log message: - Build as shared library and install properly in lib64
---- Files affected: packages/nodejs: nodejs.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: packages/nodejs/nodejs.spec diff -u packages/nodejs/nodejs.spec:1.15 packages/nodejs/nodejs.spec:1.16 --- packages/nodejs/nodejs.spec:1.15 Sun Feb 20 06:59:05 2011 +++ packages/nodejs/nodejs.spec Mon Feb 21 19:51:05 2011 @@ -10,6 +10,9 @@ Source0: http://nodejs.org/dist/node-v%{version}.tar.gz # Source0-md5: 9566bdbd05c18cc2bbe1fa0fba60dd0a 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 @@ -37,6 +40,7 @@ Summary: Development headers for nodejs Group: Development/Libraries Requires: waf +Requires: %{name} = %{version}-%{release} %description devel Development headers for nodejs. @@ -44,6 +48,9 @@ %prep %setup -q -n node-v%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p0 %build # build library @@ -64,9 +71,13 @@ --shared-v8 \ --shared-cares \ --shared-libev \ + --libdir=%{_libdir} \ --prefix=%{_prefix} -%waf build +%waf build \ + --product-type=cshlib + +$CC -o node -Isrc src/node_main.cc -lnode -Lbuild/default %install rm -rf $RPM_BUILD_ROOT @@ -74,8 +85,11 @@ export PYTHONPATH=tools %waf install \ + --product-type=cshlib \ --destdir=$RPM_BUILD_ROOT +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 @@ -86,11 +100,15 @@ %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog LICENSE %attr(755,root,root) %{_bindir}/node %dir %{_libdir}/node +%attr(755,root,root) %{_libdir}/libnode.so.*.*.* %dir %{_libdir}/node/libraries %{_libdir}/node/libraries/*.js %{_mandir}/man1/node.1* @@ -99,8 +117,9 @@ %defattr(644,root,root,755) %{_includedir}/node %attr(755,root,root) %{_bindir}/node-waf +%{_libdir}/libnode.so %{_libdir}/waf/wafadmin/Tools/node_addon.py -/usr/lib/pkgconfig/nodejs.pc +%{_libdir}/pkgconfig/nodejs.pc %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -108,6 +127,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2011/02/21 18:51:05 aredridel +- Build as shared library and install properly in lib64 + Revision 1.15 2011/02/20 05:59:05 aredridel - 0.4.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nodejs/nodejs.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
