[packages/minify/dev-3.0] up to a0e781e snap
glen
glen at pld-linux.org
Tue Sep 13 13:53:53 CEST 2016
commit fd59652d52f39b0d1ab4cafdc2e1c3bde53e8364
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Sep 13 14:49:30 2016 +0300
up to a0e781e snap
- firephp dropped, available via monolog
- The project root is now what is deployed as `min`
- Removes JSMin+ (unmaintained, high memory usage)
- Removes DooDigestAuth
- Removes Minify_Loader (uses Composer)
- Removes Minify_Logger (uses Monolog)
- Removes `$min_libPath` option
- The Minify, source, and controller components have changed APIs
- Better CSS minification via Túbal Martín's CSSMin
- Minify::VERSION is an int that tracks the major version number
minify.spec | 16 ++++++----------
paths.patch | 8 ++++----
pear-firephp.patch | 30 ------------------------------
yui-path.patch | 8 ++++----
4 files changed, 14 insertions(+), 48 deletions(-)
---
diff --git a/minify.spec b/minify.spec
index 295f302..22f9a8f 100644
--- a/minify.spec
+++ b/minify.spec
@@ -1,18 +1,17 @@
-%define php_min_version 5.2.1
-%define subver 273a08f
+%define php_min_version 5.3.0
+%define subver a0e781e
%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: 3.0
-Release: 2.6
+Version: 3.0.0
+Release: 0.1
License: New BSD License
Group: Applications/WWW
#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: https://github.com/mrclay/minify/archive/%{subver}/%{name}-%{version}-%{subver}.tar.gz
-# Source0-md5: 524e397b24721820b04a57dac4419875
+# Source0-md5: ccb1404f4f04331636c8ef7e0d3baf7b
Patch0: paths.patch
-Patch1: pear-firephp.patch
Patch2: yui-path.patch
Patch3: contentfunc-params.patch
Source1: apache.conf
@@ -33,7 +32,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define cachedir /var/cache/%{name}
# skip pear deps
-%define _noautoreq_pear .*Minify/Loader.php FirePHPCore/FirePHP.class.php
+%define _noautoreq_pear .*Minify/Loader.php
%description
Minify is a PHP5 app that helps you follow several of Yahoo!'s Rules
@@ -55,7 +54,6 @@ Requires: php(spl)
Requires: php-dirs
Requires: php-yui-css-compressor
Suggests: lessphp >= 0.4.0
-Suggests: php-firephp-FirePHPCore
%description -n php-%{name}
Minify Classes.
@@ -83,7 +81,6 @@ Unit tests for Minify.
mv %{name}-*/* .
%undos -f php
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%undos UPGRADING.txt
@@ -164,6 +161,5 @@ fi
%dir %{php_data_dir}/HTTP
%{php_data_dir}/HTTP/ConditionalGet.php
%{php_data_dir}/HTTP/Encoder.php
-%{php_data_dir}/DooDigestAuth.php
%{php_data_dir}/Minify.php
%{php_data_dir}/Minify
diff --git a/paths.patch b/paths.patch
index a6bbbed..74c1e45 100644
--- a/paths.patch
+++ b/paths.patch
@@ -50,14 +50,14 @@
/**
* Filepath of "java" executable (may be needed if not in shell's PATH)
---- minify-2.1.5/lib/Minify/YUICompressor.php~ 2012-06-08 12:53:52.000000000 +0300
-+++ minify-2.1.5/lib/Minify/YUICompressor.php 2012-06-08 12:58:02.023505622 +0300
-@@ -42,7 +42,7 @@
+--- minify-3.0/lib/Minify/YUICompressor.php~ 2016-09-13 14:45:21.416679630 +0300
++++ minify-3.0/lib/Minify/YUICompressor.php 2016-09-13 14:45:43.943019718 +0300
+@@ -45,7 +45,7 @@
*
* @var string
*/
- public static $tempDir = null;
+ public static $tempDir = '/tmp';
-
+
/**
* Filepath of "java" executable (may be needed if not in shell's PATH)
diff --git a/pear-firephp.patch b/pear-firephp.patch
deleted file mode 100644
index cf2f605..0000000
--- a/pear-firephp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- minify-2.1.5/index.php~ 2012-11-24 17:36:52.000000000 +0200
-+++ minify-2.1.5/index.php 2012-11-24 17:38:55.089986108 +0200
-@@ -42,6 +42,7 @@
-
- if ($min_errorLogger) {
- if (true === $min_errorLogger) {
-+ require_once 'FirePHPCore/FirePHP.class.php';
- $min_errorLogger = FirePHP::getInstance(true);
- }
- Minify_Logger::setLogger($min_errorLogger);
--- minify-2.1.5/min_extras/tools/minifyTextarea.php~ 2012-11-24 17:36:52.000000000 +0200
-++ minify-2.1.5/min_extras/tools/minifyTextarea.php 2012-11-24 17:39:25.224568521 +0200
-@@ -31,6 +31,7 @@
- $sourceSpec['minifyOptions']['cssMinifier'] = array('Minify_CSS', 'minify');
- }
- $source = new Minify_Source($sourceSpec);
-+ require_once 'FirePHPCore/FirePHP.class.php';
- Minify_Logger::setLogger(FirePHP::getInstance(true));
- try {
- Minify::serve('Files', array(
--- minify-2.1.5/min_unit_tests/_inc.php~ 2012-11-24 17:36:52.000000000 +0200
-++ minify-2.1.5/min_unit_tests/_inc.php 2012-11-24 17:39:45.102059111 +0200
-@@ -17,6 +17,7 @@
- if ($min_errorLogger && true !== $min_errorLogger) { // custom logger
- Minify_Logger::setLogger($min_errorLogger);
- } else {
-+ require_once 'FirePHPCore/FirePHP.class.php';
- Minify_Logger::setLogger(FirePHP::getInstance(true));
- }
-
diff --git a/yui-path.patch b/yui-path.patch
index c7af0de..657179d 100644
--- a/yui-path.patch
+++ b/yui-path.patch
@@ -1,11 +1,11 @@
---- minify-2.1.5/lib/Minify/YUICompressor.php~ 2012-03-29 15:05:43.656136317 +0300
-+++ minify-2.1.5/lib/Minify/YUICompressor.php 2012-03-29 15:04:42.000000000 +0300
-@@ -34,7 +34,7 @@
+--- minify-3.0/lib/Minify/YUICompressor.php~ 2016-09-13 14:48:49.356998362 +0300
++++ minify-3.0/lib/Minify/YUICompressor.php 2016-09-13 14:49:07.236739393 +0300
+@@ -37,7 +37,7 @@
*
* @var string
*/
- public static $jarFile = null;
+ public static $jarFile = '/usr/share/java/yuicompressor.jar';
-
+
/**
* Writable temp directory. This must be set before calling minifyJs()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/minify.git/commitdiff/fd59652d52f39b0d1ab4cafdc2e1c3bde53e8364
More information about the pld-cvs-commit
mailing list