- php deps, use system firephp package (from pear dir)

Changed files:
    minify.spec -> 1.6
    pear-firephp.patch -> 1.1

diff --git a/minify.spec b/minify.spec
index b0d06c0ab5c149d2c654610afdc47c02e89edb87..421856085cd28bfb581dba60d425059c909ef4ad 100644 (file)
--- a/minify.spec
+++ b/minify.spec
@@ -1,19 +1,24 @@
+%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)
@@ -35,6 +40,12 @@ optimal client-side cache headers.
 %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.
@@ -43,6 +54,8 @@ Minify Classes.
 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.
@@ -58,12 +71,16 @@ Unit tests for Minify.
 %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}}
@@ -129,7 +146,6 @@ fi
 %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

diff --git a/pear-firephp.patch b/pear-firephp.patch
new file mode 100644 (file)
index 0000000..29fdc74
--- /dev/null
+++ b/pear-firephp.patch
@@ -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();