[nodejs-moment] Create js-moment subpackage (#1151813)

Jamie Nguyen jamielinux at fedoraproject.org
Mon Nov 3 19:02:28 UTC 2014


commit 89f35447bc32107716a32d9beb991271ce16c7bf
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Mon Nov 3 18:58:20 2014 +0000

    Create js-moment subpackage (#1151813)

 nodejs-moment.spec |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/nodejs-moment.spec b/nodejs-moment.spec
index 822eaa0..85e152f 100644
--- a/nodejs-moment.spec
+++ b/nodejs-moment.spec
@@ -4,7 +4,7 @@
 
 Name:       nodejs-moment
 Version:    2.6.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Parse, manipulate and display dates
 License:    MIT
 Group:      System Environment/Libraries
@@ -23,6 +23,7 @@ ExclusiveArch: %{ix86} x86_64 %{arm} noarch
 %endif
 
 BuildRequires:  nodejs-packaging
+BuildRequires:  web-assets-devel
 
 BuildRequires:  uglify-js
 BuildRequires:  npm(grunt-cli)
@@ -33,15 +34,26 @@ BuildRequires:  npm(load-grunt-tasks)
 %if 0%{?enable_tests}
 BuildRequires:  npm(grunt-contrib-nodeunit)
 BuildRequires:  npm(grunt-contrib-watch)
-BuildRequires:  npm(grunt-env)
+# BuildRequires:  npm(grunt-env)
 BuildRequires:  npm(nodeunit)
 %endif
 
+Requires:       js-moment = 0:%{version}-%{release}
+
 
 %description
 %{summary}.
 
 
+%package -n js-moment
+Summary:    Parse, manipulate and display dates for the browser
+Group:      System Environment/Libraries
+Requires:   web-assets-filesystem
+
+%description -n js-moment
+Parse, manipulate and display dates for the browser.
+
+
 %prep
 %setup -q -n package
 %setup -q -T -D -a 1 -n package
@@ -53,16 +65,21 @@ rm -f min/*.min.js
 
 
 %build
-%if 0%{?fedora} >= 21
 %nodejs_symlink_deps --check
 /usr/bin/grunt uglify
-%endif
 
 
 %install
+mkdir -p %{buildroot}%{_jsdir}/moment
+cp -pr lang/ min/ moment.js \
+    %{buildroot}%{_jsdir}/moment
+
 mkdir -p %{buildroot}%{nodejs_sitelib}/moment
-cp -pr package.json bower.json component.json composer.json ender.js \
-    lang/ min/ moment.js package.js \
+cp -pr package.json bower.json component.json composer.json \
+    ender.js package.js \
+    %{buildroot}%{nodejs_sitelib}/moment
+
+ln -s %{_jsdir}/lang %{_jsdir}/min %{_jsdir}/moment.js \
     %{buildroot}%{nodejs_sitelib}/moment
 
 %nodejs_symlink_deps
@@ -78,8 +95,15 @@ cp -pr package.json bower.json component.json composer.json ender.js \
 %doc CONTRIBUTING.md LICENSE readme.md
 %{nodejs_sitelib}/moment
 
+%files -n js-moment
+%doc CONTRIBUTING.md LICENSE readme.md
+%{_jsdir}/moment
+
 
 %changelog
+* Mon Nov 03 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 2.6.0-4
+- create js-moment subpackage (#1151813)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list