From 8791ea86c0684f385a464064464f8760c93c9fa6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 18 Sep 2011 22:16:53 +0000 Subject: [PATCH] - quote cc, ghost soname symlink Changed files: nodejs.spec -> 1.23 --- nodejs.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index a5a2446..e7422df 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -1,4 +1,3 @@ - Summary: Asynchronous JavaScript Engine Name: nodejs Version: 0.4.12 @@ -22,8 +21,6 @@ BuildRequires: v8-devel >= 3.1.5 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 @@ -53,36 +50,35 @@ CFLAGS="%{rpmcflags}" CXXFLAGS="%{rpmcxxflags}" LDFLAGS="%{rpmcflags}" %if "%{pld_release}" == "ac" -CC=%{__cc}4 -CXX=%{__cxx}4 +CC="%{__cc}4" +CXX="%{__cxx}4" %else -CC=%{__cc} -CXX=%{__cxx} +CC="%{__cc}" +CXX="%{__cxx}" %endif export CFLAGS LDFLAGS CXXFLAGS CC CXX export PYTHONPATH=tools -python tools/waf-light configure \ +%{__python} tools/waf-light configure \ --shared-v8 \ --shared-cares \ --shared-libev \ --libdir=%{_libdir} \ --prefix=%{_prefix} -python tools/waf-light build \ +%{__python} tools/waf-light build \ --product-type='cshlib' $CC -o build/default/node -Isrc src/node_main.cc -lnode -Lbuild/default %install rm -rf $RPM_BUILD_ROOT - export PYTHONPATH=tools -python tools/waf-light install \ +%{__python} tools/waf-light install \ --product-type=cshlib \ --destdir=$RPM_BUILD_ROOT -install build/default/node $RPM_BUILD_ROOT%{_bindir}/node +install -p build/default/node $RPM_BUILD_ROOT%{_bindir}/node %clean rm -rf $RPM_BUILD_ROOT @@ -94,8 +90,9 @@ rm -rf $RPM_BUILD_ROOT %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.*.*.* +%ghost %{_libdir}/libnode.so.4 +%dir %{_libdir}/node %{_mandir}/man1/node.1* %files devel @@ -107,4 +104,4 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/node/wafadmin/Tools %{_libdir}/node/wafadmin/*.py %{_libdir}/node/wafadmin/Tools/*.py -%{_libdir}/pkgconfig/nodejs.pc +%{_pkgconfigdir}/nodejs.pc -- 2.44.0