Author: glen Date: Mon Aug 23 20:27:53 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- package pciconf, drop tests; rel 4
---- Files affected:
packages/php-pear-PHP_CompatInfo:
php-pear-PHP_CompatInfo.spec (1.46 -> 1.47)
---- 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.46
packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec:1.47
--- packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec:1.46 Mon Aug
23 22:06:06 2010
+++ packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec Mon Aug
23 22:27:48 2010
@@ -1,14 +1,12 @@
# $Revision$, $Date$
%include /usr/lib/rpm/macros.php
-%define _class PHP
-%define _subclass CompatInfo
%define _status stable
-%define _pearname %{_class}_%{_subclass}
+%define _pearname PHP_CompatInfo
Summary: %{_pearname} - determine minimal requirements for a program
Summary(pl.UTF-8): %{_pearname} - określanie minimalnych wymagań programu
Name: php-pear-%{_pearname}
Version: 1.9.0
-Release: 3
+Release: 4
License: New BSD
Group: Development/Languages/PHP
Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz
@@ -18,7 +16,7 @@
URL: http://pear.php.net/package/PHP_CompatInfo/
BuildRequires: php-pear-PEAR >= 1:1.5.4
BuildRequires: rpm-php-pearprov >= 4.4.2-11
-BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: rpmbuild(macros) >= 1.571
Requires: php-pcre
Requires: php-pear
Requires: php-pear-Console_Getargs >= 1.3.3
@@ -33,6 +31,7 @@
Suggests: php-pear-Var_Dump
Suggests: php-pear-XML_Beautifier
Suggests: php-pear-XML_Util
+Obsoletes: php-pear-PHP_CompatInfo-tests
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -77,21 +76,7 @@
Requires: %{name} = %{version}-%{release}
%description Renderers
-Additional format Renderers for PHP_CompatInfo
-
-%package tests
-Summary: Tests for PEAR::%{_pearname}
-Summary(pl.UTF-8): Testy dla PEAR::%{_pearname}
-Group: Development
-Requires: %{name} = %{version}-%{release}
-AutoProv: no
-AutoReq: no
-
-%description tests
-Tests for PEAR::%{_pearname}.
-
-%description tests -l pl.UTF-8
-Testy dla PEAR::%{_pearname}.
+Additional format Renderers for PHP_CompatInfo.
%prep
%pear_package_setup
@@ -109,43 +94,47 @@
s/pecl_http/pecl-http/
s/apc/pecl-APC/
s/fileinfo/pecl-fileinfo/
-}' ./%{php_pear_dir}/%{_class}/%{_subclass}/func_array.php
+}' ./%{php_pear_dir}/PHP/CompatInfo/func_array.php
+
+# wtf is this
+mv ./%{_bindir}/scripts .
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{php_pear_dir},%{_bindir},%{_examplesdir}/%{name}-%{version}}
%pear_package_install
-install ./%{_bindir}/pci $RPM_BUILD_ROOT%{_bindir}/pcicmd
+install -p ./%{_bindir}/* $RPM_BUILD_ROOT%{_bindir}
cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+# don't care for tests
+rm -rf $RPM_BUILD_ROOT%{php_pear_dir}/tests/%{_pearname}
+
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
- cat %{_docdir}/%{name}-%{version}/optional-packages.txt
-fi
+%post -p <lua>
+%pear_package_print_optionalpackages
%files
%defattr(644,root,root,755)
%doc install.log optional-packages.txt
%{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/%{_class}/CompatInfo.php
-%{php_pear_dir}/%{_class}/%{_subclass}/*.php
-%exclude %{php_pear_dir}/%{_class}/%{_subclass}/Cli.php
-%dir %{php_pear_dir}/%{_class}/%{_subclass}
-%dir %{php_pear_dir}/%{_class}/%{_subclass}/Renderer
-%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Null.php
+%{php_pear_dir}/PHP/CompatInfo.php
+%{php_pear_dir}/PHP/CompatInfo/*.php
+%exclude %{php_pear_dir}/PHP/CompatInfo/Cli.php
+%dir %{php_pear_dir}/PHP/CompatInfo
+%dir %{php_pear_dir}/PHP/CompatInfo/Renderer
+%{php_pear_dir}/PHP/CompatInfo/Renderer/Null.php
%files Renderers
%defattr(644,root,root,755)
-%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Array.php
-%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Csv.php
-%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Html.php
-%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Text.php
-%{php_pear_dir}/%{_class}/%{_subclass}/Renderer/Xml.php
+%{php_pear_dir}/PHP/CompatInfo/Renderer/Array.php
+%{php_pear_dir}/PHP/CompatInfo/Renderer/Csv.php
+%{php_pear_dir}/PHP/CompatInfo/Renderer/Html.php
+%{php_pear_dir}/PHP/CompatInfo/Renderer/Text.php
+%{php_pear_dir}/PHP/CompatInfo/Renderer/Xml.php
# CSS for HTML Renderer
%{php_pear_dir}/data/%{_pearname}
@@ -155,12 +144,9 @@
%files cli
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pcicmd
-%{php_pear_dir}/%{_class}/%{_subclass}/Cli.php
-
-%files tests
-%defattr(644,root,root,755)
-%{php_pear_dir}/tests/%{_pearname}
+%attr(755,root,root) %{_bindir}/pci
+%attr(755,root,root) %{_bindir}/pciconf
+%{php_pear_dir}/PHP/CompatInfo/Cli.php
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -168,6 +154,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.47 2010/08/23 20:27:48 glen
+- package pciconf, drop tests; rel 4
+
Revision 1.46 2010/08/23 20:06:06 glen
- fix Console_Getargs caps, http://pear.php.net/bugs/bug.php?id=17804
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-PHP_CompatInfo/php-pear-PHP_CompatInfo.spec?r1=1.46&r2=1.47&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
