commit eab9097fbe02a847761962766d091feb6ba28cbd
Author: Elan Ruusamäe <[email protected]>
Date: Sat Nov 24 18:08:24 2012 +0200
up to 7e08cff to include autoloader
minify.spec | 15 +++++++--------
pear-firephp.patch | 40 +++++++++++++++++-----------------------
2 files changed, 24 insertions(+), 31 deletions(-)
---
diff --git a/minify.spec b/minify.spec
index 5c56f83..ff3104d 100644
--- a/minify.spec
+++ b/minify.spec
@@ -3,12 +3,12 @@
Summary: Combines, minifies, and caches JavaScript and CSS files on
demand to speed up page loads
Name: minify
Version: 2.1.5
-Release: 6
+Release: 7
License: New BSD License
Group: Applications/WWW
#Source0: https://minify.googlecode.com/files/%{name}-%{version}.zip
Source0:
https://github.com/mrclay/minify/tarball/master#/%{name}-%{version}.tgz
-# Source0-md5: b2c39b7edf323e99232141b8d25cbde4
+# Source0-md5: 7ead5f2bc26630c16b206c7c50e2aba1
#Source0:
https://github.com/glensc/minify/tarball/lesscss#/%{name}-less-%{version}.tgz
Patch0: paths.patch
Patch1: pear-firephp.patch
@@ -32,7 +32,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define cachedir /var/cache/%{name}
# skip pear deps
-%define _noautopear pear(Minify.*) pear(JSMin.*)
pear(HTTP/ConditionalGet.php) pear(HTTP/Encoder.php) Requires:
pear(FirePHPCore/FirePHP.class.php)
+%define _noautopear pear(.*Minify/Loader.php)
pear(FirePHPCore/FirePHP.class.php)
# put it together for rpmbuild
%define _noautoreq %{?_noautophp} %{?_noautopear}
@@ -49,9 +49,11 @@ optimal client-side cache headers.
Summary: Minify Classes
Group: Applications/WWW
Requires: php(core) >= %{php_min_version}
+Requires: php(ctype)
+Requires: php(date)
Requires: php(mbstring)
Requires: php(pcre)
-Requires: php-date
+Requires: php(spl)
Requires: php-dirs
Suggests: php-firephp-FirePHPCore
@@ -77,7 +79,6 @@ Requires: %{name} = %{version}-%{release}
Unit tests for Minify.
%prep
-#%setup
%setup -qc
mv *-minify-*/* .
%undos -f php
@@ -88,8 +89,6 @@ mv *-minify-*/* .
find -type f | xargs chmod a-x
-#mv min/README.txt README.min.txt
-
# not needed for functionality
%{__rm} min/lib/Minify/YUI/CssCompressor.java
%{__rm} -r min/lib/MrClay
@@ -165,7 +164,7 @@ fi
%dir %{php_data_dir}/HTTP
%{php_data_dir}/HTTP/ConditionalGet.php
%{php_data_dir}/HTTP/Encoder.php
-%{php_data_dir}/CSSMin.php
+%{php_data_dir}/CSSmin.php
%{php_data_dir}/DooDigestAuth.php
%{php_data_dir}/JSMin.php
%{php_data_dir}/JSMinPlus.php
diff --git a/pear-firephp.patch b/pear-firephp.patch
index 29fdc74..12dde46 100644
--- a/pear-firephp.patch
+++ b/pear-firephp.patch
@@ -1,36 +1,30 @@
---- minify-2.1.4/min/index.php~ 2011-08-09 09:44:09.000000000 +0300
-+++ minify-2.1.4/min/index.php 2011-08-09 09:47:16.322774073 +0300
-@@ -53,7 +53,7 @@
+--- minify-2.1.5/min/index.php~ 2012-11-24 17:36:52.000000000 +0200
++++ minify-2.1.5/min/index.php 2012-11-24 17:38:55.089986108 +0200
+@@ -42,6 +42,7 @@
+
if ($min_errorLogger) {
- require_once 'Minify/Logger.php';
if (true === $min_errorLogger) {
-- require_once 'FirePHP.php';
+ require_once 'FirePHPCore/FirePHP.class.php';
$min_errorLogger = FirePHP::getInstance(true);
}
Minify_Logger::setLogger($min_errorLogger);
-@@ -82,4 +82,4 @@
- } else {
- header("Location: /");
- exit();
--}
-\ No newline at end of file
-+}
---- minify-2.1.4/./min_unit_tests/_inc.php~ 2011-08-09 09:44:09.000000000
+0300
-+++ minify-2.1.4/./min_unit_tests/_inc.php 2011-08-09 09:47:33.516828562
+0300
-@@ -17,7 +17,7 @@
+--- 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 'FirePHP.php';
+ require_once 'FirePHPCore/FirePHP.class.php';
Minify_Logger::setLogger(FirePHP::getInstance(true));
}
-@@ -60,4 +60,4 @@
- : strlen($str);
- }
-
--ob_start();
-\ No newline at end of file
-+ob_start();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/minify.git/commitdiff/eab9097fbe02a847761962766d091feb6ba28cbd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
