[nodejs/el6] split off a -packaging subpackage with RPM macros, etc.

T.C. Hollingsworth patches at fedoraproject.org
Wed Jun 19 03:29:14 UTC 2013


commit ce9addf6980043232c5e6349cec04b96f0852935
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Tue Jun 18 20:05:21 2013 -0700

    split off a -packaging subpackage with RPM macros, etc.
    
    This way nodejs-packaging can be approved and imported without
    forcing a nodejs update at the same time.
    (cherry picked from commit d46eff9f818d2efe8d936bd78cd74c302176f2c1)
    
    Conflicts:
    	nodejs.spec

 nodejs.spec |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/nodejs.spec b/nodejs.spec
index 065382d..370d099 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -70,6 +70,7 @@ Summary: JavaScript runtime - development headers
 Group: Development/Languages
 Requires: %{name} == %{version}-%{release}
 Requires: libuv-devel http-parser-devel openssl-devel c-ares19-devel zlib-devel
+Requires: nodejs-packaging
 
 %description devel
 Development headers for the Node.js JavaScript runtime.
@@ -81,6 +82,17 @@ Group: Documentation
 %description docs
 The API documentation for the Node.js JavaScript runtime.
 
+%package packaging
+Summary: RPM macros and utilities for Node.js packaging
+Group: Development/Tools
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description packaging
+This package contains RPM macros and other utilities useful for packaging
+Node.js modules and applications in RPM-based distributions.
+
+
 %prep
 %setup -q -n node-v%{version}
 %patch1 -p0
@@ -165,16 +177,20 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
 %{_bindir}/node_g
 %{_includedir}/node
 %{_datadir}/node
-%{_sysconfdir}/rpm/macros.nodejs
-%{_rpmconfigdir}/nodejs*
 
 %files docs
 %{_defaultdocdir}/%{name}-docs-%{version}
 
+%files packaging
+%{_sysconfdir}/rpm/macros.nodejs
+%{_rpmconfigdir}/fileattrs/nodejs*.attr
+%{_rpmconfigdir}/nodejs*
+
 %changelog
 * Wed Jun 19 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.12-1
 - new upstream release 0.10.12
   http://blog.nodejs.org/2013/06/18/node-v0-10-12-stable/
+- split off a -packaging subpackage with RPM macros, etc.
 
 * Fri May 31 2013 T.C. Hollingsworth <tchollingsworth at gmail.com> - 0.10.9-1
 - new upstream release 0.10.9


More information about the scm-commits mailing list