- reverted to glen's version

[packages/nodejs.git] / nodejs.spec

diff --git a/nodejs.spec b/nodejs.spec
index cf65704e0e4046ad257539ac1291b116dbce6541..745fbc9fd1ad743d908a8470fac9e9010dfc2fac 100644 (file)
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -1,17 +1,18 @@
 Summary:       Asynchronous JavaScript Engine
 Name:          nodejs
-Version:       0.6.13
+Version:       0.6.21
 Release:       1
 License:       BSD and MIT and ASL 2.0 and GPLv3
 Group:         Development/Languages
 URL:           http://www.nodejs.org/
 Source0:       http://nodejs.org/dist/v%{version}/node-v%{version}.tar.gz
-# Source0-md5: 87078586e226fd7a4db60d38bea9aad6
+# Source0-md5: 0da985a0bf820400af92363b9f453fe4
 Patch1:                %{name}-soname.patch
 # force node to use /usr/lib/node as the systemwide module directory
 Patch2:                %{name}-libpath.patch
 # use /usr/lib64/node as an arch-specific module dir when appropriate
 Patch3:                %{name}-lib64path.patch
+Patch5:                uv-fpic.patch
 BuildRequires: c-ares-devel >= 1.7.4
 BuildRequires: gcc >= 5:4.0
 BuildRequires: libeio-devel
@@ -76,12 +77,14 @@ used by Node.js and many of its modules.
 %else
 %patch2 -p1
 %endif
+%patch5 -p1
 
 # fix #!/usr/bin/env python -> #!/usr/bin/python:
 grep -rl 'bin/env python' tools | xargs %{__sed} -i -e '1s,^#!.*python,#!%{__python},'
 
 %build
 CFLAGS="%{rpmcflags} -fPIC"
+CPPFLAGS="%{rpmcppflags} -fPIC"
 CXXFLAGS="%{rpmcxxflags} -fPIC"
 LDFLAGS="%{rpmcflags}"
 %if "%{pld_release}" == "ac"
@@ -91,7 +94,7 @@ CXX="%{__cxx}4"
 CC="%{__cc}"
 CXX="%{__cxx}"
 %endif
-export CFLAGS LDFLAGS CXXFLAGS CC CXX
+export CFLAGS LDFLAGS CXXFLAGS CC CXX LINKFLAGS_UV
 
 # Error: V8 doesn't like ccache. Please set your CC env var to 'gcc'
 CC=${CC#ccache }
@@ -118,6 +121,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+echo '.so man1/node.1' > $RPM_BUILD_ROOT%{_mandir}/man1/nodejs.1
+
 # for compat of fedora derivered scripts (shebangs)
 ln -s node $RPM_BUILD_ROOT%{_bindir}/nodejs
 
@@ -155,14 +160,10 @@ EOF
 #%%py_postclean %{_libdir}/node/wafadmin
 
 # install documentation
-install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/html
-cp -a doc/* $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/html
-cd $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
-install -d api
-mv html/api/*.markdown api
-mv html/api/api/* html/api
-rm -rf html/api/api
-cd -
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
+cp -a doc/api/* $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}
+rm $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/*.markdown
+rm $RPM_BUILD_ROOT%{_docdir}/%{name}-doc-%{version}/*.json
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -177,10 +178,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/nodejs
 %attr(755,root,root) %{_libdir}/libnode.so.*.*.*
 %ghost %{_libdir}/libnode.so.6
+%if "%{_lib}" != "lib"
 %dir %{_libdir}/node
+%endif
 %dir %{_prefix}/lib/node
 %dir %{_prefix}/lib/node_modules
 %{_mandir}/man1/node.1*
+%{_mandir}/man1/nodejs.1
 
 %files devel
 %defattr(644,root,root,755)