packages: minify/minify.spec, minify/pear-firephp.patch (NEW) - php deps, u...

[glen]

Author: glen                         Date: Tue Aug  9 06:52:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- php deps, use system firephp package (from pear dir)

---- Files affected:
packages/minify:
   minify.spec (1.5 -> 1.6) , pear-firephp.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/minify/minify.spec
diff -u packages/minify/minify.spec:1.5 packages/minify/minify.spec:1.6
--- packages/minify/minify.spec:1.5	Mon Aug  8 22:44:57 2011
+++ packages/minify/minify.spec	Tue Aug  9 08:52:00 2011
@@ -1,20 +1,25 @@
 # $Revision$, $Date$
+%define		php_min_version 5.2.1
+%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.1.4
-Release:	0.13
+Release:	0.15
 License:	New BSD License
 Group:		Applications/WWW
 #Source0:	http://minify.googlecode.com/files/%{name}_%{version}_beta.zip
 Source0:	https://github.com/mrclay/minify/tarball/master#/%{name}.tgz
 # Source0-md5:	2eeff0f069b52b89ba78c22d20de60e2
 Patch0:		paths.patch
+Patch1:		pear-firephp.patch
 Source1:	apache.conf
 Source2:	lighttpd.conf
 URL:		http://code.google.com/p/minify/
 BuildRequires:	rpmbuild(macros) >= 1.553
 BuildRequires:	unzip
 Requires:	php-%{name} = %{version}-%{release}
+Requires:	php-common >= 4:%{php_min_version}
+Requires:	php-pcre
 Requires:	webapps
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,6 +41,12 @@
 %package -n php-%{name}
 Summary:	Minify Classes
 Group:		Applications/WWW
+Requires:	php-common >= 4:%{php_min_version}
+Requires:	php-date
+Requires:	php-dirs
+Requires:	php-mbstring
+Requires:	php-pcre
+Suggests:	php-firephp-FirePHPCore
 
 %description -n php-%{name}
 Minify Classes.
@@ -44,6 +55,8 @@
 Summary:	Minify URI Builder
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
+Requires:	php-common >= 4:%{php_min_version}
+Requires:	php-pcre
 
 %description builder
 Minify URI Builder.
@@ -59,12 +72,16 @@
 %prep
 %setup -qc
 mv mrclay-minify-*/* .
+%undos -f php
 %patch0 -p1
+%patch1 -p1
 %undos UPGRADING.txt
-%undos -f php
 
 mv min/README.txt README.min.txt
 
+# php-firephp-FirePHPCore
+rm min/lib/FirePHP.php
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{php_data_dir},%{_sysconfdir},%{_appdir},%{cachedir}}
@@ -130,7 +147,6 @@
 %dir %{php_data_dir}/HTTP
 %{php_data_dir}/HTTP/ConditionalGet.php
 %{php_data_dir}/HTTP/Encoder.php
-%{php_data_dir}/FirePHP.php
 %{php_data_dir}/JSMin.php
 %{php_data_dir}/JSMinPlus.php
 %{php_data_dir}/Minify.php
@@ -142,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/08/09 06:52:00  glen
+- php deps, use system firephp package (from pear dir)
+
 Revision 1.5  2011/08/08 20:44:57  glen
 - use github code, adds option to minify JS with Closure Compiler API w/ JSMin failover
 

================================================================
Index: packages/minify/pear-firephp.patch
diff -u /dev/null packages/minify/pear-firephp.patch:1.1
--- /dev/null	Tue Aug  9 08:52:05 2011
+++ packages/minify/pear-firephp.patch	Tue Aug  9 08:52:00 2011
@@ -0,0 +1,36 @@
+--- 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 @@
+ 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 @@
+ 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();
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/minify/minify.spec?r1=1.5&r2=1.6&f=u