mayorga pushed to nodejs-handlebars (f22). "Fixing lib directory install (#1172471)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 5 04:27:27 UTC 2015
>From f5ce081fe6643e2219b16fc7b309363a98daed9c Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Wed, 26 Nov 2014 12:02:06 -0600
Subject: Initial import (#1123537).
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
new file mode 100644
index 0000000..b9f23b7
--- /dev/null
+++ b/nodejs-handlebars.spec
@@ -0,0 +1,81 @@
+# This macro is needed at the start for building on EL6
+%{?nodejs_find_provides_and_requires}
+
+%global enable_tests 0
+
+%global npm_name handlebars
+
+Name: nodejs-%{npm_name}
+Version: 2.0.0
+Release: 2%{dist}
+Summary: Mustache extension for Node.js
+Group: Development/Libraries
+
+License: MIT
+URL: http://handlebarsjs.com/
+Source0: http://registry.npmjs.org/handlebars/-/%{npm_name}-%{version}.tgz
+
+BuildRequires: npm(uglify-js)
+BuildRequires: npm(optimist)
+
+Requires: npm(uglify-js)
+Requires: npm(optimist)
+
+BuildRequires: nodejs-devel
+BuildRequires: nodejs-packaging
+
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
+
+%description
+Handlebars.js is an extension to the Mustache templating language created by
+Chris Wanstrath. Handlebars.js and Mustache are both logicless templating
+languages that keep the view and the code separated like we all know they should
+be.
+
+%prep
+%setup -q -n package
+
+# Remove bundled optimist
+rm -rf node_modules
+
+%build
+%nodejs_symlink_deps --build
+
+
+%install
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
+chmod a+x bin/handlebars
+cp -rp bin package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
+
+# Install /usr/bin/handlebars
+ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
+ %{buildroot}%{_bindir}
+
+%nodejs_symlink_deps
+
+%check
+%if 0%{?enable_tests}
+%nodejs_symlink_deps --check
+%endif
+
+
+%files
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.markdown release-notes.md
+%{nodejs_sitelib}/handlebars/
+%{_bindir}/handlebars
+
+
+%changelog
+* Tue Nov 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-2
+- Fixing symlink to CLI
+
+* Thu Nov 20 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-1
+- Update to final release 2.0.0
+- Adding missing Requires
+
+* Fri Jul 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-0.1.alpha.4
+- Initial packaging
--
cgit v0.10.2
--
cgit v0.10.2
>From e6b322a5ea3eaeca62729f9a81b86aa43d75db3b Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Wed, 26 Nov 2014 13:09:47 -0600
Subject: Revert "Initial import (#1123537)."
This reverts commit f5ce081fe6643e2219b16fc7b309363a98daed9c.
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
deleted file mode 100644
index b9f23b7..0000000
--- a/nodejs-handlebars.spec
+++ /dev/null
@@ -1,81 +0,0 @@
-# This macro is needed at the start for building on EL6
-%{?nodejs_find_provides_and_requires}
-
-%global enable_tests 0
-
-%global npm_name handlebars
-
-Name: nodejs-%{npm_name}
-Version: 2.0.0
-Release: 2%{dist}
-Summary: Mustache extension for Node.js
-Group: Development/Libraries
-
-License: MIT
-URL: http://handlebarsjs.com/
-Source0: http://registry.npmjs.org/handlebars/-/%{npm_name}-%{version}.tgz
-
-BuildRequires: npm(uglify-js)
-BuildRequires: npm(optimist)
-
-Requires: npm(uglify-js)
-Requires: npm(optimist)
-
-BuildRequires: nodejs-devel
-BuildRequires: nodejs-packaging
-
-BuildArch: noarch
-ExclusiveArch: %{nodejs_arches} noarch
-
-%description
-Handlebars.js is an extension to the Mustache templating language created by
-Chris Wanstrath. Handlebars.js and Mustache are both logicless templating
-languages that keep the view and the code separated like we all know they should
-be.
-
-%prep
-%setup -q -n package
-
-# Remove bundled optimist
-rm -rf node_modules
-
-%build
-%nodejs_symlink_deps --build
-
-
-%install
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
-chmod a+x bin/handlebars
-cp -rp bin package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
-
-# Install /usr/bin/handlebars
-ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
- %{buildroot}%{_bindir}
-
-%nodejs_symlink_deps
-
-%check
-%if 0%{?enable_tests}
-%nodejs_symlink_deps --check
-%endif
-
-
-%files
-%{!?_licensedir:%global license %%doc}
-%license LICENSE
-%doc README.markdown release-notes.md
-%{nodejs_sitelib}/handlebars/
-%{_bindir}/handlebars
-
-
-%changelog
-* Tue Nov 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-2
-- Fixing symlink to CLI
-
-* Thu Nov 20 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-1
-- Update to final release 2.0.0
-- Adding missing Requires
-
-* Fri Jul 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-0.1.alpha.4
-- Initial packaging
--
cgit v0.10.2
>From 0b54f2e676972d4f7995e0257cafbaa9d52fa3c8 Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Wed, 26 Nov 2014 13:13:48 -0600
Subject: Initial import (#1123537).
diff --git a/.gitignore b/.gitignore
index e69de29..4d1fc4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/handlebars-2.0.0.tgz
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
new file mode 100644
index 0000000..b9f23b7
--- /dev/null
+++ b/nodejs-handlebars.spec
@@ -0,0 +1,81 @@
+# This macro is needed at the start for building on EL6
+%{?nodejs_find_provides_and_requires}
+
+%global enable_tests 0
+
+%global npm_name handlebars
+
+Name: nodejs-%{npm_name}
+Version: 2.0.0
+Release: 2%{dist}
+Summary: Mustache extension for Node.js
+Group: Development/Libraries
+
+License: MIT
+URL: http://handlebarsjs.com/
+Source0: http://registry.npmjs.org/handlebars/-/%{npm_name}-%{version}.tgz
+
+BuildRequires: npm(uglify-js)
+BuildRequires: npm(optimist)
+
+Requires: npm(uglify-js)
+Requires: npm(optimist)
+
+BuildRequires: nodejs-devel
+BuildRequires: nodejs-packaging
+
+BuildArch: noarch
+ExclusiveArch: %{nodejs_arches} noarch
+
+%description
+Handlebars.js is an extension to the Mustache templating language created by
+Chris Wanstrath. Handlebars.js and Mustache are both logicless templating
+languages that keep the view and the code separated like we all know they should
+be.
+
+%prep
+%setup -q -n package
+
+# Remove bundled optimist
+rm -rf node_modules
+
+%build
+%nodejs_symlink_deps --build
+
+
+%install
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
+chmod a+x bin/handlebars
+cp -rp bin package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
+
+# Install /usr/bin/handlebars
+ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
+ %{buildroot}%{_bindir}
+
+%nodejs_symlink_deps
+
+%check
+%if 0%{?enable_tests}
+%nodejs_symlink_deps --check
+%endif
+
+
+%files
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.markdown release-notes.md
+%{nodejs_sitelib}/handlebars/
+%{_bindir}/handlebars
+
+
+%changelog
+* Tue Nov 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-2
+- Fixing symlink to CLI
+
+* Thu Nov 20 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-1
+- Update to final release 2.0.0
+- Adding missing Requires
+
+* Fri Jul 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-0.1.alpha.4
+- Initial packaging
diff --git a/sources b/sources
index e69de29..01c1036 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+fabd0fbc7eeb346676d2afeaf5e68521 handlebars-2.0.0.tgz
--
cgit v0.10.2
>From 6a024686dfda943075981fdcf5ccab0ef246d66a Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Mon, 8 Dec 2014 17:33:35 -0600
Subject: Adding dist directory (#1171403)
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
index b9f23b7..6c76f75 100644
--- a/nodejs-handlebars.spec
+++ b/nodejs-handlebars.spec
@@ -7,7 +7,7 @@
Name: nodejs-%{npm_name}
Version: 2.0.0
-Release: 2%{dist}
+Release: 3%{dist}
Summary: Mustache extension for Node.js
Group: Development/Libraries
@@ -47,7 +47,7 @@ rm -rf node_modules
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
chmod a+x bin/handlebars
-cp -rp bin package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
+cp -rp bin dist package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
# Install /usr/bin/handlebars
ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
@@ -70,6 +70,9 @@ ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
%changelog
+* Mon Dec 08 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-3
+- Adding dist directory (#1171403)
+
* Tue Nov 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-2
- Fixing symlink to CLI
--
cgit v0.10.2
>From bd3c7279ea7076f49ac8977fde1f99b9e1c70084 Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Mon, 8 Dec 2014 18:35:08 -0600
Subject: Revert "Adding dist directory (#1171403)"
This reverts commit 95a527241a21d6fd83a33a694857365bdac547c7, reversing
changes made to 0a84ae3bd04d46bfb29b34f259f796a804a179fd.
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
index 6e35937..b9f23b7 100644
--- a/nodejs-handlebars.spec
+++ b/nodejs-handlebars.spec
@@ -7,7 +7,7 @@
Name: nodejs-%{npm_name}
Version: 2.0.0
-Release: 3%{dist}
+Release: 2%{dist}
Summary: Mustache extension for Node.js
Group: Development/Libraries
@@ -47,11 +47,7 @@ rm -rf node_modules
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
chmod a+x bin/handlebars
-<<<<<<< HEAD
cp -rp bin package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
-=======
-cp -rp bin dist package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
->>>>>>> master
# Install /usr/bin/handlebars
ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
@@ -74,9 +70,6 @@ ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
%changelog
-* Mon Dec 08 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-3
-- Adding dist directory (#1171403)
-
* Tue Nov 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-2
- Fixing symlink to CLI
--
cgit v0.10.2
>From c99ba0b42b5e88d9d2af3fccb0237d93be67ac5c Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Mon, 8 Dec 2014 18:59:27 -0600
Subject: Adding dist directory (#1171403)
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
index b9f23b7..6c76f75 100644
--- a/nodejs-handlebars.spec
+++ b/nodejs-handlebars.spec
@@ -7,7 +7,7 @@
Name: nodejs-%{npm_name}
Version: 2.0.0
-Release: 2%{dist}
+Release: 3%{dist}
Summary: Mustache extension for Node.js
Group: Development/Libraries
@@ -47,7 +47,7 @@ rm -rf node_modules
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
chmod a+x bin/handlebars
-cp -rp bin package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
+cp -rp bin dist package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
# Install /usr/bin/handlebars
ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
@@ -70,6 +70,9 @@ ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
%changelog
+* Mon Dec 08 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-3
+- Adding dist directory (#1171403)
+
* Tue Nov 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-2
- Fixing symlink to CLI
--
cgit v0.10.2
>From f6c806ace11cf5d33bea0cccdf5d39bb3915265a Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Mon, 8 Dec 2014 19:01:47 -0600
Subject: Adding dist directory (#1171403)
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
index b9f23b7..6c76f75 100644
--- a/nodejs-handlebars.spec
+++ b/nodejs-handlebars.spec
@@ -7,7 +7,7 @@
Name: nodejs-%{npm_name}
Version: 2.0.0
-Release: 2%{dist}
+Release: 3%{dist}
Summary: Mustache extension for Node.js
Group: Development/Libraries
@@ -47,7 +47,7 @@ rm -rf node_modules
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
chmod a+x bin/handlebars
-cp -rp bin package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
+cp -rp bin dist package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
# Install /usr/bin/handlebars
ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
@@ -70,6 +70,9 @@ ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
%changelog
+* Mon Dec 08 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-3
+- Adding dist directory (#1171403)
+
* Tue Nov 25 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-2
- Fixing symlink to CLI
--
cgit v0.10.2
>From a5c34d8e62b6c0a8d325bfa723f49426e58a3346 Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Wed, 10 Dec 2014 10:50:58 -0600
Subject: Fixing lib directory install (#1172471)
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
index 6c76f75..995aba0 100644
--- a/nodejs-handlebars.spec
+++ b/nodejs-handlebars.spec
@@ -14,13 +14,11 @@ Group: Development/Libraries
License: MIT
URL: http://handlebarsjs.com/
Source0: http://registry.npmjs.org/handlebars/-/%{npm_name}-%{version}.tgz
-
-BuildRequires: npm(uglify-js)
-BuildRequires: npm(optimist)
-
Requires: npm(uglify-js)
Requires: npm(optimist)
+BuildRequires: npm(uglify-js)
+BuildRequires: npm(optimist)
BuildRequires: nodejs-devel
BuildRequires: nodejs-packaging
@@ -47,7 +45,7 @@ rm -rf node_modules
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
chmod a+x bin/handlebars
-cp -rp bin dist package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
+cp -rp bin dist package.json lib runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
# Install /usr/bin/handlebars
ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
@@ -70,6 +68,9 @@ ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
%changelog
+* Wed Dec 10 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-4
+- Fixing lib directory install (#1172471)
+
* Mon Dec 08 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-3
- Adding dist directory (#1171403)
--
cgit v0.10.2
>From f37ad8333d497c11772c5e2b99500594a263fce5 Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Wed, 10 Dec 2014 10:56:52 -0600
Subject: Revert "Fixing lib directory install (#1172471)"
This reverts commit a5c34d8e62b6c0a8d325bfa723f49426e58a3346.
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
index 995aba0..6c76f75 100644
--- a/nodejs-handlebars.spec
+++ b/nodejs-handlebars.spec
@@ -14,11 +14,13 @@ Group: Development/Libraries
License: MIT
URL: http://handlebarsjs.com/
Source0: http://registry.npmjs.org/handlebars/-/%{npm_name}-%{version}.tgz
-Requires: npm(uglify-js)
-Requires: npm(optimist)
BuildRequires: npm(uglify-js)
BuildRequires: npm(optimist)
+
+Requires: npm(uglify-js)
+Requires: npm(optimist)
+
BuildRequires: nodejs-devel
BuildRequires: nodejs-packaging
@@ -45,7 +47,7 @@ rm -rf node_modules
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
chmod a+x bin/handlebars
-cp -rp bin dist package.json lib runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
+cp -rp bin dist package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
# Install /usr/bin/handlebars
ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
@@ -68,9 +70,6 @@ ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
%changelog
-* Wed Dec 10 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-4
-- Fixing lib directory install (#1172471)
-
* Mon Dec 08 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-3
- Adding dist directory (#1171403)
--
cgit v0.10.2
>From 332f878df6ad7776430a71955be85a5ed7308806 Mon Sep 17 00:00:00 2001
From: Eduardo Mayorga <mayorga at fedoraproject.org>
Date: Wed, 10 Dec 2014 11:00:20 -0600
Subject: Fixing lib directory install (#1172471)
diff --git a/nodejs-handlebars.spec b/nodejs-handlebars.spec
index 6c76f75..cf530cc 100644
--- a/nodejs-handlebars.spec
+++ b/nodejs-handlebars.spec
@@ -7,7 +7,7 @@
Name: nodejs-%{npm_name}
Version: 2.0.0
-Release: 3%{dist}
+Release: 4%{dist}
Summary: Mustache extension for Node.js
Group: Development/Libraries
@@ -15,12 +15,11 @@ License: MIT
URL: http://handlebarsjs.com/
Source0: http://registry.npmjs.org/handlebars/-/%{npm_name}-%{version}.tgz
-BuildRequires: npm(uglify-js)
-BuildRequires: npm(optimist)
-
Requires: npm(uglify-js)
Requires: npm(optimist)
+BuildRequires: npm(uglify-js)
+BuildRequires: npm(optimist)
BuildRequires: nodejs-devel
BuildRequires: nodejs-packaging
@@ -47,7 +46,7 @@ rm -rf node_modules
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{nodejs_sitelib}/handlebars
chmod a+x bin/handlebars
-cp -rp bin dist package.json lib/* runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
+cp -rp bin dist package.json lib runtime.js %{buildroot}/%{nodejs_sitelib}/handlebars
# Install /usr/bin/handlebars
ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
@@ -70,6 +69,9 @@ ln -s %{nodejs_sitelib}/handlebars/bin/handlebars \
%changelog
+* Wed Dec 10 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-4
+- Fixing lib directory install (#1172471)
+
* Mon Dec 08 2014 Eduardo Mayorga Téllez <mayorga at fedoraproject.org> - 2.0.0-3
- Adding dist directory (#1171403)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/nodejs-handlebars.git/commit/?h=f22&id=df17c85110592f06c89bf6c4196a479efd5ab170
More information about the scm-commits
mailing list