packages: php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec, php-pear-PH...

[glen]

Author: glen                         Date: Mon Aug 23 21:17:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix path to pciconf "scripts"; rel 5

---- Files affected:
packages/php-pear-PHP_CompatInfo:
   php-pear-PHP_CompatInfo.spec (1.47 -> 1.48) , path-scripts.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec
diff -u packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec:1.47 packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec:1.48
--- packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec:1.47	Mon Aug 23 22:27:48 2010
+++ packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec	Mon Aug 23 23:17:30 2010
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	%{_pearname} - określanie minimalnych wymagań programu
 Name:		php-pear-%{_pearname}
 Version:	1.9.0
-Release:	4
+Release:	5
 License:	New BSD
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
@@ -96,8 +96,9 @@
 	s/fileinfo/pecl-fileinfo/
 }' ./%{php_pear_dir}/PHP/CompatInfo/func_array.php
 
-# wtf is this
-mv ./%{_bindir}/scripts .
+# used by pciconf, move to datadir
+install -d ./%{php_pear_dir}/data/%{_pearname}
+mv ./%{_bindir}/scripts ./%{php_pear_dir}/data/%{_pearname}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -127,6 +128,7 @@
 %dir %{php_pear_dir}/PHP/CompatInfo
 %dir %{php_pear_dir}/PHP/CompatInfo/Renderer
 %{php_pear_dir}/PHP/CompatInfo/Renderer/Null.php
+%dir %{php_pear_dir}/data/%{_pearname}
 
 %files Renderers
 %defattr(644,root,root,755)
@@ -137,7 +139,7 @@
 %{php_pear_dir}/PHP/CompatInfo/Renderer/Xml.php
 
 # CSS for HTML Renderer
-%{php_pear_dir}/data/%{_pearname}
+%{php_pear_dir}/data/%{_pearname}/pci.css
 
 # examples use other Renderers than null, so packaged here
 %{_examplesdir}/%{name}-%{version}
@@ -148,12 +150,19 @@
 %attr(755,root,root) %{_bindir}/pciconf
 %{php_pear_dir}/PHP/CompatInfo/Cli.php
 
+# data for pciconf
+%{php_pear_dir}/data/%{_pearname}/scripts
+%{php_pear_dir}/data/%{_pearname}/data
+
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2010/08/23 21:17:30  glen
+- fix path to pciconf "scripts"; rel 5
+
 Revision 1.47  2010/08/23 20:27:48  glen
 - package pciconf, drop tests; rel 4
 

================================================================
Index: packages/php-pear-PHP_CompatInfo/path-scripts.patch
diff -u /dev/null packages/php-pear-PHP_CompatInfo/path-scripts.patch:1.1
--- /dev/null	Mon Aug 23 23:17:35 2010
+++ packages/php-pear-PHP_CompatInfo/path-scripts.patch	Mon Aug 23 23:17:30 2010
@@ -0,0 +1,11 @@
+--- php-pear-PHP_CompatInfo/usr/bin/pciconf~	2010-08-23 23:28:20.000000000 +0300
++++ php-pear-PHP_CompatInfo/usr/bin/pciconf	2010-08-24 00:06:24.135544265 +0300
+@@ -150,7 +150,7 @@
+         exit(1);
+     }
+ } else {
+-    include_once dirname(__FILE__) . $ds . 'scripts' . $ds . 'exceptions.conf.php';
++    include_once '/usr/share/pear/data'.$ds.'PHP_CompatInfo'.$ds.'scripts' . $ds . 'exceptions.conf.php';
+ }
+ 
+ $const_glob_list = array();
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec?r1=1.47&r2=1.48&f=u