rpms/php-pear-PHPUnit/F-11 php-pear-PHPUnit.spec, 1.15, 1.16 sources, 1.12, 1.13

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/php-pear-PHPUnit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13488

Modified Files:
	php-pear-PHPUnit.spec sources 
Log Message:
update to 3.3.16


Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/F-11/php-pear-PHPUnit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- php-pear-PHPUnit.spec	26 Feb 2009 22:05:04 -0000	1.15
+++ php-pear-PHPUnit.spec	3 May 2009 16:36:38 -0000	1.16
@@ -1,10 +1,10 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name PHPUnit
-%define channel pear.phpunit.de
+%global pear_name PHPUnit
+%global channel pear.phpunit.de
 
 Name:           php-pear-PHPUnit
-Version:        3.3.4
-Release:        2%{?dist}
+Version:        3.3.16
+Release:        1%{?dist}
 Summary:        Regression testing framework for unit tests
 
 Group:          Development/Libraries
@@ -14,19 +14,21 @@ Source0:        http://pear.phpunit.de/g
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.4.9-1.2
-BuildRequires:  php-channel-phpunit
-Requires:       php >= 5.1.4 php-pear(PEAR) >= 1.5.0
-Requires:       php-channel-phpunit php-xml
-
-Requires(hint): php-pear(Image_GraphViz) >= 1.2.1
-Requires(hint): php-pear(Log)
-#Requires(hint): php-pear(Testing_Selenium) >= 0.2.0
-Requires(hint): php-json
-Requires(hint): php-pecl(Xdebug) >= 2.0.0
+BuildRequires:  php-pear(PEAR) >= 1.7.1
+BuildRequires:  php-channel(pear.phpunit.de)
+
+Requires:       php-common >= 5.1.4 php-xml
+Requires:       php-pear(PEAR) >= 1.7.1
+Requires:       php-channel(pear.phpunit.de) 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
+# Optionnal dependencies
+Requires:       php-pear(Image_GraphViz) >= 1.2.1
+Requires:       php-pear(Log)
+Requires:       php-json php-pdo
+Requires:       php-pecl(Xdebug) >= 2.0.0
+
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 
 %description
@@ -39,8 +41,8 @@ for the creation, execution and analysis
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# package.xml is V2
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -54,7 +56,7 @@ cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
 
 # Install Package
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
@@ -65,7 +67,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
 
 # Install XML package description
 install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -80,7 +82,7 @@ if [ $1 -gt  1 ] ; then
 fi
 
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -92,13 +94,18 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc %{pear_name}-%{version}/docdir/%{pear_name}/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/%{pear_name}
 %{_bindir}/phpunit
 
 
 %changelog
+* Sat May 02 2009 Remi Collet <Fedora at famillecollet.com> - 3.3.16-1
+- Upstream sync
+- Fix requires (remove hint) and raise PEAR version to 1.7.1
+- rename %%{pear_name}.xml to %%{name}.xml
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	8 Nov 2008 18:36:30 -0000	1.12
+++ sources	3 May 2009 16:36:38 -0000	1.13
@@ -1 +1 @@
-973eb6ba8b5158ca597ce10b7b511216  PHPUnit-3.3.4.tgz
+1bafa52c00d773c84931d43e37532729  PHPUnit-3.3.16.tgz