[lessjs] Upgrade to new upstream release and switch to proper Node.js packaging

Stephen Gallagher sgallagh at fedoraproject.org
Tue Apr 9 13:43:14 UTC 2013


commit 34a6e6093df3f5632cd068190516e2c1d85e2981
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Apr 9 09:07:20 2013 -0400

    Upgrade to new upstream release and switch to proper Node.js packaging
    
    - New upstream release 1.3.3
        * Fix critical bug with mixin call if using multiple brackets
        * When using the filter contrast function, the function is passed through if
          the first argument is not a color
    - New upstream release 1.3.2
        * browser and server url re-writing is now aligned to not re-write (previous
          lessc behaviour)
        * url-rewriting can be made to re-write to be relative to the entry file
          using the relative-urls option (less.relativeUrls option)
        * rootpath option can be used to add a base path to every url
        * Support mixin argument seperator of ';' so you can pass comma seperated
          values. e.g. .mixin(23px, 12px;);
        * Fix lots of problems with named arguments in corner cases, not behaving
          as expected
        * hsv, hsva, unit functions
        * fixed lots more bad error messages
        * fix @import-once to use the full path, not the relative one for
          determining if an import has been imported already
        * support :not(:nth-child(3))
        * mixin guards take units into account
        * support unicode descriptors (U+00A1-00A9)
        * support calling mixins with a stack when using & (broken in 1.3.1)
        * support @namespace and namespace combinators
        * when using % with colour functions, take into account a colour is out of
          256
        * when doing maths with a % do not divide by 100 and keep the unit
        * allow url to contain % (e.g. %20 for a space)
        * if a mixin guard stops execution a default mixin is not required
        * units are output in strings (use the unit function if you need to get the
          value without unit)
        * do not infinite recurse when mixins call mixins of the same name
        * fix issue on important on mixin calls
        * fix issue with multiple comments being confused
        * tolerate multiple semi-colons on rules
        * ignore subsequant @charset
        * syncImport option for node.js to read files syncronously
        * write the output directory if it is missing
        * change dependency on cssmin to ycssmin
        * lessc can load files over http
        * allow calling less.watch() in non dev mode
        * don't cache in dev mode
        * less files cope with query parameters better
        * sass debug statements are now chrome compatible
        * modifyVars function added to re-render with different root variables

 .gitignore                                         |    1 +
 0001-Disable-YUI-compression.patch                 |  421 -
 ...e-include-files-from-the-default-location.patch |   18 +-
 0002-Fix-version-number.patch                      |   25 -
 0004-Remove-pre-builds.patch                       |45901 --------------------
 lessjs.spec                                        |   94 +-
 sources                                            |    2 +-
 7 files changed, 79 insertions(+), 46383 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c5b3de..c756058 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /less.js-1.3.1.tar.gz
+/less.js-1.3.3.tar.gz
diff --git a/0003-substitute-paths-to-use-usr-share-instead-of-usr-lib.patch b/0001-Require-include-files-from-the-default-location.patch
similarity index 62%
rename from 0003-substitute-paths-to-use-usr-share-instead-of-usr-lib.patch
rename to 0001-Require-include-files-from-the-default-location.patch
index ce60ebe..6feeec4 100644
--- a/0003-substitute-paths-to-use-usr-share-instead-of-usr-lib.patch
+++ b/0001-Require-include-files-from-the-default-location.patch
@@ -1,14 +1,14 @@
-From ea94b55d0b71b79d80ce80cc964983f20e7054d1 Mon Sep 17 00:00:00 2001
+From 0f4272fd6082ce4a5d55894a09334cd9bcf68a8c Mon Sep 17 00:00:00 2001
 From: Stephen Gallagher <sgallagh at redhat.com>
 Date: Wed, 19 Dec 2012 09:06:24 -0500
-Subject: [PATCH 3/4] substitute paths to use /usr/share instead of /usr/lib
+Subject: [PATCH] Require include files from the default location :
 
 ---
  bin/lessc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/bin/lessc b/bin/lessc
-index af96ea237b3fb82284b38babf6562b7c5849f668..231298719ed0b9f745281f71e4cf374aec13c04c 100755
+index 31a6700b73d81190202dfc9566c00a56ee60cb02..24d526121adc0fd29487747774e4e5a56662b9e6 100755
 --- a/bin/lessc
 +++ b/bin/lessc
 @@ -5,7 +5,7 @@ var path = require('path'),
@@ -16,28 +16,28 @@ index af96ea237b3fb82284b38babf6562b7c5849f668..231298719ed0b9f745281f71e4cf374a
      os = require('os');
  
 -var less = require('../lib/less');
-+var less = require('../share/less');
++var less = require('less');
  var args = process.argv.slice(1);
  var options = {
      compress: false,
-@@ -51,7 +51,7 @@ args = args.filter(function (arg) {
+@@ -53,7 +53,7 @@ args = args.filter(function (arg) {
              break;
          case 'h':
          case 'help':
 -            require('../lib/less/lessc_helper').printUsage();
-+            require('../share/less/lessc_helper').printUsage();
++            require('less/lessc_helper').printUsage();
              continueProcessing = false;
          case 'x':
          case 'compress':
-@@ -99,7 +99,7 @@ if (output) {
+@@ -116,7 +116,7 @@ if (output) {
  if (! input) {
      sys.puts("lessc: no input files");
      sys.puts("");
 -    require('../lib/less/lessc_helper').printUsage();
-+    require('../share/less/lessc_helper').printUsage();
++    require('less/lessc_helper').printUsage();
      currentErrorcode = 1;
      return;
  }
 -- 
-1.8.0.1
+1.8.1.4
 
diff --git a/lessjs.spec b/lessjs.spec
index cf05908..3ecf90a 100644
--- a/lessjs.spec
+++ b/lessjs.spec
@@ -1,6 +1,6 @@
 Name:           lessjs
-Version:        1.3.1
-Release:        5%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Less.js The dynamic stylesheet language
 
 # cssmin.js is licensed under BSD license
@@ -8,22 +8,11 @@ Summary:        Less.js The dynamic stylesheet language
 License:        ASL 2.0 and BSD
 
 URL:            http://lesscss.org
-# The source URL does not match the output filename:
-# Source0:        https://github.com/cloudhead/less.js/archive/v%{version}.tar.gz
-Source0: less.js-%{version}.tar.gz
+Source0: http://registry.npmjs.org/less/-/less-1.3.3.tgz
 
-# Fedora/EPEL patch to disable YUI compression because lessjs otherwise
-# would be carrying a bundled copy of cssmin.js
-Patch0001: 0001-Disable-YUI-compression.patch
-
-# Upstream version number is incorrect for 1.3.1
-Patch0002: 0002-Fix-version-number.patch
-
-# Use /usr/share paths instead of /usr/lib
-Patch0003: 0003-substitute-paths-to-use-usr-share-instead-of-usr-lib.patch
-
-# Remove pre-built files from the dist/ directory
-Patch0004: 0004-Remove-pre-builds.patch
+# Since we're installing this in a global location, fix the require()
+# calls to point there.
+Patch0001: 0001-Require-include-files-from-the-default-location.patch
 
 BuildArch:      noarch
 BuildRequires:  nodejs
@@ -35,12 +24,12 @@ and functions. LESS runs on both the client-side (Chrome, Safari, Firefox)
 and server-side, with Node.js and Rhino.
 
 %prep
-%setup -q -n less.js-%{version}
+%setup -q -n package
 
 %patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
+
+# Remove pre-built files from the dist/ directory
+rm -f dist/*.js
 
 %build
 # Nothing to be built, we're just carrying around flat files
@@ -51,17 +40,70 @@ make %{?_smp_mflags} test
 
 %install
 mkdir -p %{buildroot}%{_bindir}
-install bin/lessc %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_datadir}/less
-cp -rp lib/less %{buildroot}%{_datadir}
+mkdir -p %{buildroot}%{nodejs_sitelib}/less
+chmod a+x bin/lessc
+cp -rp bin package.json lib/less/* %{buildroot}/%{nodejs_sitelib}/less
+
+# Install /usr/bin/lessc
+ln -s %{nodejs_sitelib}/less/bin/lessc \
+      %{buildroot}%{_bindir}
+
+%nodejs_symlink_deps
 
 %files
-%doc LICENSE README.md
+%doc LICENSE README.md CHANGELOG.md CONTRIBUTING.md
 %{_bindir}/lessc
-%{_datadir}/less
+%{nodejs_sitelib}/less
 
 
 %changelog
+* Tue Apr 09 2013 Stephen Gallagher <sgallagh at redhat.com> - 1.3.3-1
+- Upgrade to new upstream release and switch to proper Node.js packaging
+- New upstream release 1.3.3
+    * Fix critical bug with mixin call if using multiple brackets
+    * When using the filter contrast function, the function is passed through if
+      the first argument is not a color
+- New upstream release 1.3.2
+    * browser and server url re-writing is now aligned to not re-write (previous
+      lessc behaviour)
+    * url-rewriting can be made to re-write to be relative to the entry file
+      using the relative-urls option (less.relativeUrls option)
+    * rootpath option can be used to add a base path to every url
+    * Support mixin argument seperator of ';' so you can pass comma seperated
+      values. e.g. .mixin(23px, 12px;);
+    * Fix lots of problems with named arguments in corner cases, not behaving
+      as expected
+    * hsv, hsva, unit functions
+    * fixed lots more bad error messages
+    * fix @import-once to use the full path, not the relative one for
+      determining if an import has been imported already
+    * support :not(:nth-child(3))
+    * mixin guards take units into account
+    * support unicode descriptors (U+00A1-00A9)
+    * support calling mixins with a stack when using & (broken in 1.3.1)
+    * support @namespace and namespace combinators
+    * when using %% with colour functions, take into account a colour is out of
+      256
+    * when doing maths with a %% do not divide by 100 and keep the unit
+    * allow url to contain %% (e.g. %%20 for a space)
+    * if a mixin guard stops execution a default mixin is not required
+    * units are output in strings (use the unit function if you need to get the
+      value without unit)
+    * do not infinite recurse when mixins call mixins of the same name
+    * fix issue on important on mixin calls
+    * fix issue with multiple comments being confused
+    * tolerate multiple semi-colons on rules
+    * ignore subsequant @charset
+    * syncImport option for node.js to read files syncronously
+    * write the output directory if it is missing
+    * change dependency on cssmin to ycssmin
+    * lessc can load files over http
+    * allow calling less.watch() in non dev mode
+    * don't cache in dev mode
+    * less files cope with query parameters better
+    * sass debug statements are now chrome compatible
+    * modifyVars function added to re-render with different root variables
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 4d6e6d8..ff0c92b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea231720e2d8818055fb9474d7c79d71  less.js-1.3.1.tar.gz
+51f0e8e36bac21ce174f525c1314236f  less.js-1.3.3.tar.gz


More information about the scm-commits mailing list