[packages/minify] - v3.0, .less support via lessphp
glen
glen at pld-linux.org
Sun Sep 21 15:35:05 CEST 2014
commit 4ca11b017f7687bd68bc265bcba57da62aeeb339
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Sep 21 16:34:16 2014 +0300
- v3.0, .less support via lessphp
contentfunc-params.patch | 14 +++++++++-----
minify.spec | 13 ++++++++-----
paths.patch | 9 ++++-----
3 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/minify.spec b/minify.spec
index 70ad48b..e014057 100644
--- a/minify.spec
+++ b/minify.spec
@@ -2,17 +2,18 @@
%include /usr/lib/rpm/macros.php
Summary: Combines, minifies, and caches JavaScript and CSS files on demand to speed up page loads
Name: minify
-Version: 2.2.0
+Version: 3.0
Release: 1
License: New BSD License
Group: Applications/WWW
-Source0: https://github.com/mrclay/minify/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 25b45b2340cae680d169f75c8dcafbc7
+#Source0: https://github.com/mrclay/minify/archive/%{version}/%{name}-%{version}.tar.gz
+Source0: https://github.com/glensc/minify/archive/lessphp-dev3/%{name}-%{version}.tar.gz
+# Source0-md5: a84596d6b4febde3d5f4b00698b7cc70
Patch0: paths.patch
Patch1: pear-firephp.patch
Patch2: yui-path.patch
Patch3: contentfunc-params.patch
-# Patch3-md5: bb60232a8a119d1d2eb0caa71dca9207
+# Patch3-md5: 7d141179a296592a678e545f122d6788
Source1: apache.conf
Source2: lighttpd.conf
URL: http://code.google.com/p/minify/
@@ -22,6 +23,7 @@ Requires: php(core) >= %{php_min_version}
Requires: php(pcre)
Requires: php-%{name} = %{version}-%{release}
Requires: webapps
+Suggests: lessphp >= 0.4.0
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -76,7 +78,8 @@ Requires: %{name} = %{version}-%{release}
Unit tests for Minify.
%prep
-%setup -q
+%setup -qc
+mv %{name}-*/* .
%undos -f php
%patch0 -p1
%patch1 -p1
diff --git a/contentfunc-params.patch b/contentfunc-params.patch
index 1ae35c1..3fd4070 100644
--- a/contentfunc-params.patch
+++ b/contentfunc-params.patch
@@ -33,11 +33,15 @@ index 5a85d10..6825dd4 100644
);
// remove UTF-8 BOM if present
return (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3))
-@@ -182,6 +185,7 @@ public static function getContentType($sources)
-
- protected $_content = null;
+@@ -188,6 +188,11 @@
protected $_getContentFunc = null;
+
+ /**
++ * @var array
++ */
+ protected $_getContentFuncParams = array();
++
++ /**
+ * @var string
+ */
protected $_id = null;
- }
-
diff --git a/paths.patch b/paths.patch
index e9cd028..a74d527 100644
--- a/paths.patch
+++ b/paths.patch
@@ -9,17 +9,16 @@
)
,'minifyAll' => true
,'encodeOutput' => $encodeOutput
---- minify-2.1.4/min/config.php~ 2011-08-08 23:41:52.000000000 +0300
-+++ minify-2.1.4/min/config.php 2011-08-08 23:42:34.122570527 +0300
-@@ -47,6 +47,8 @@
+--- minify-3.0/min/config.php~ 2014-09-21 14:35:09.243242976 +0300
++++ minify-3.0/min/config.php 2014-09-21 14:35:25.356335208 +0300
+@@ -52,6 +52,7 @@
//$min_cachePath = 'c:\\WINDOWS\\Temp';
//$min_cachePath = '/tmp';
//$min_cachePath = preg_replace('/^\\d+;/', '', session_save_path());
+$min_cachePath = '/var/cache/minify';
-+
+
/**
* To use APC/Memcache/ZendPlatform for cache storage, require the class and
- * set $min_cachePath to an instance. Example below:
@@ -161,7 +162,7 @@
* Path to Minify's lib folder. If you happen to move it, change
* this accordingly.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/minify.git/commitdiff/4ca11b017f7687bd68bc265bcba57da62aeeb339
More information about the pld-cvs-commit
mailing list