Author: glen Date: Tue May 3 22:11:19 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- setup rpm paths
---- Files affected:
packages/minify:
apache.conf (1.1 -> 1.2) , minify.spec (1.3 -> 1.4) , paths.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/minify/apache.conf
diff -u packages/minify/apache.conf:1.1 packages/minify/apache.conf:1.2
--- packages/minify/apache.conf:1.1 Tue Nov 30 07:29:43 2010
+++ packages/minify/apache.conf Wed May 4 00:11:14 2011
@@ -3,7 +3,6 @@
Allow from all
php_value zlib.output_compression 0
-
<IfModule mod_rewrite.c>
RewriteEngine on
================================================================
Index: packages/minify/minify.spec
diff -u packages/minify/minify.spec:1.3 packages/minify/minify.spec:1.4
--- packages/minify/minify.spec:1.3 Tue May 3 23:13:16 2011
+++ packages/minify/minify.spec Wed May 4 00:11:14 2011
@@ -2,10 +2,11 @@
Summary: Combines, minifies, and caches JavaScript and CSS files on demand to speed up page loads
Name: minify
Version: 2.1.4
-Release: 0.10
+Release: 0.12
License: New BSD License
Group: Applications/WWW
Source0: http://minify.googlecode.com/files/%{name}_%{version}_beta.zip
+Patch0: paths.patch
# Source0-md5: f604b827980a8994c1b4dfd6f5974786
Source1: apache.conf
Source2: lighttpd.conf
@@ -56,6 +57,7 @@
%prep
%setup -qc
+%patch0 -p1
%undos UPGRADING.txt
%undos -f php
@@ -65,18 +67,17 @@
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{php_data_dir},%{_sysconfdir},%{_appdir},%{cachedir}}
-cp -a min/* $RPM_BUILD_ROOT%{_appdir}
-
-mv $RPM_BUILD_ROOT%{_appdir}/lib/* $RPM_BUILD_ROOT%{php_data_dir}
+cp -a min/*.php min/builder $RPM_BUILD_ROOT%{_appdir}
+cp -a min/lib/* $RPM_BUILD_ROOT%{php_data_dir}
for config in config.php groupsConfig.php; do
mv $RPM_BUILD_ROOT{%{_appdir}/$config,%{_sysconfdir}}
ln -s %{_sysconfdir}/$config $RPM_BUILD_ROOT%{_appdir}
done
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -a $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
%triggerin -- apache1 < 1.3.37-3, apache1-base
%webapp_register apache %{_webapp}
@@ -141,6 +142,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2011/05/03 22:11:14 glen
+- setup rpm paths
+
Revision 1.3 2011/05/03 21:13:16 glen
- 2.1.4-beta
================================================================
Index: packages/minify/paths.patch
diff -u /dev/null packages/minify/paths.patch:1.1
--- /dev/null Wed May 4 00:11:19 2011
+++ packages/minify/paths.patch Wed May 4 00:11:14 2011
@@ -0,0 +1,30 @@
+--- ./min/builder/index.php~ 2011-05-04 01:07:43.000000000 +0300
++++ ./min/builder/index.php 2011-05-04 01:07:45.460184430 +0300
+@@ -244,7 +244,7 @@
+ // regenerate cache if any of these change
+ filemtime(__FILE__)
+ ,filemtime(dirname(__FILE__) . '/../config.php')
+- ,filemtime(dirname(__FILE__) . '/../lib/Minify.php')
++ ,filemtime($min_libPath.'/Minify.php')
+ )
+ ,'minifyAll' => true
+ ,'encodeOutput' => $encodeOutput
+--- minify-2.1.4/min/config.php 2011-05-04 01:09:34.368042578 +0300
++++ minify-2.1.4/min/config.php 2011-05-04 01:06:36.643994770 +0300
+@@ -49,6 +49,7 @@
+ //$min_cachePath = 'c:\\WINDOWS\\Temp';
+ //$min_cachePath = '/tmp';
+ //$min_cachePath = preg_replace('/^\\d+;/', '', session_save_path());
++$min_cachePath = '/var/cache/minify';
+
+
+ /**
+@@ -161,7 +162,7 @@
+ * Path to Minify's lib folder. If you happen to move it, change
+ * this accordingly.
+ */
+-$min_libPath = dirname(__FILE__) . '/lib';
++$min_libPath = '/usr/share/php';
+
+
+ // try to disable output_compression (may not have an effect)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/minify/apache.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/minify/minify.spec?r1=1.3&r2=1.4&f=u