packages: php-pear-Console_Getargs/php-pear-Console_Getargs.spec, php-pear-...

[glen]

Author: glen                         Date: Mon Aug 23 21:00:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix deprecatio warning
- freshen up package

---- Files affected:
packages/php-pear-Console_Getargs:
   php-pear-Console_Getargs.spec (1.26 -> 1.27) , deprecation.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-pear-Console_Getargs/php-pear-Console_Getargs.spec
diff -u packages/php-pear-Console_Getargs/php-pear-Console_Getargs.spec:1.26 packages/php-pear-Console_Getargs/php-pear-Console_Getargs.spec:1.27
--- packages/php-pear-Console_Getargs/php-pear-Console_Getargs.spec:1.26	Thu Jan 31 13:16:05 2008
+++ packages/php-pear-Console_Getargs/php-pear-Console_Getargs.spec	Mon Aug 23 23:00:22 2010
@@ -1,26 +1,25 @@
 # $Revision$, $Date$
 %include	/usr/lib/rpm/macros.php
-%define		_class		Console
-%define		_subclass	Getargs
 %define		_status		stable
-%define		_pearname	%{_class}_%{_subclass}
-
+%define		_pearname	Console_Getargs
 Summary:	%{_pearname} - a command-line arguments parser
 Summary(pl.UTF-8):	%{_pearname} - przetwarzanie argumentów linii poleceń
 Name:		php-pear-%{_pearname}
 Version:	1.3.4
-Release:	2
-Epoch:		0
+Release:	3
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	30c90b46e41e023b7008c5f6306335aa
+Patch0:		deprecation.patch
 URL:		http://pear.php.net/package/Console_Getargs/
 BuildRequires:	php-pear-PEAR
+BuildRequires:	php-packagexml2cl
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	php-common >= 3:4.1.0
 Requires:	php-pear
+Obsoletes:	php-pear-Console_Getargs-tests
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,41 +42,36 @@
 
 Ta klasa ma w PEAR status: %{_status}.
 
-%package tests
-Summary:	Tests for PEAR::%{_pearname}
-Summary(pl.UTF-8):	Testy dla PEAR::%{_pearname}
-Group:		Development/Languages/PHP
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-AutoReq:	no
-AutoProv:	no
-
-%description tests
-Tests for PEAR::%{_pearname}.
-
-%description tests -l pl.UTF-8
-Testy dla PEAR::%{_pearname}.
-
 %prep
 %pear_package_setup
+%patch0 -p1
+
+mv docs/%{_pearname}/examples .
+
+%build
+packagexml2cl package.xml > ChangeLog
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
 %pear_package_install
 
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+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
 
 %files
 %defattr(644,root,root,755)
-%doc install.log
-%doc docs/%{_pearname}/examples
+%doc ChangeLog install.log
 %{php_pear_dir}/.registry/*.reg
-%{php_pear_dir}/%{_class}/*.php
+%{php_pear_dir}/Console/Getargs.php
 
-%files tests
-%defattr(644,root,root,755)
-%{php_pear_dir}/tests/*
+%{_examplesdir}/%{name}-%{version}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -85,6 +79,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/08/23 21:00:22  glen
+- fix deprecatio warning
+- freshen up package
+
 Revision 1.26  2008/01/31 12:16:05  glen
 - rel 2
 

================================================================
Index: packages/php-pear-Console_Getargs/deprecation.patch
diff -u /dev/null packages/php-pear-Console_Getargs/deprecation.patch:1.1
--- /dev/null	Mon Aug 23 23:00:28 2010
+++ packages/php-pear-Console_Getargs/deprecation.patch	Mon Aug 23 23:00:22 2010
@@ -0,0 +1,11 @@
+--- Console_Getargs-1.3.4/usr/share/pear/Console/Getargs.php~	2008-01-31 15:03:37.000000000 +0200
++++ Console_Getargs-1.3.4/usr/share/pear/Console/Getargs.php	2010-08-23 23:54:45.664365426 +0300
+@@ -212,7 +212,7 @@
+     function &factory($config = array(), $arguments = NULL)
+     {
+         // Create the options object.
+-        $obj =& new Console_Getargs_Options();
++        $obj = new Console_Getargs_Options();
+         
+         // Try to set up the arguments.
+         $err = $obj->init($config, $arguments);
================================================================

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