rpms/php-pear-PHPUnit/devel .cvsignore, 1.2, 1.3 php-pear-PHPUnit.spec, 1.3, 1.4 sources, 1.2, 1.3

Mon Mar 12 19:34:46 UTC 2007

Author: xulchris

Update of /cvs/extras/rpms/php-pear-PHPUnit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28479

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	3 Oct 2006 05:25:49 -0000	1.2
+++ .cvsignore	12 Mar 2007 19:34:13 -0000	1.3
@@ -1 +1 @@
-PHPUnit-1.3.2.tgz
+PHPUnit-3.0.5.tgz


Index: php-pear-PHPUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/php-pear-PHPUnit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-PHPUnit.spec	30 Dec 2006 16:25:47 -0000	1.3
+++ php-pear-PHPUnit.spec	12 Mar 2007 19:34:13 -0000	1.4
@@ -1,55 +1,67 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name PHPUnit
+%define channel pear.phpunit.de
 
 Name:           php-pear-PHPUnit
-Version:        1.3.2
-Release:        1%{?dist}
+Version:        3.0.5
+Release:        3%{?dist}
 Summary:        Regression testing framework for unit tests
-Summary(fr):    Outils de test de rÃ©gression pour les tests unitaires
 
 Group:          Development/Libraries
 License:        BSD
-URL:            http://pear.php.net/package/PHPUnit
-Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source2:        xml2changelog
+URL:            http://www.phpunit.de
+Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
 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
+
+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
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Provides:       php-pear(%{pear_name}) = %{version}
-Requires:       php >= 4.3.0 php-pear(PEAR)
 
-%description
-PHPUnit is a regression testing framework used by the developer who
-implements unit tests in PHP. This is the version to be used with PHP 4.
-
-Developers should use PHPUnit2 with PHP5.
+Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
+Obsoletes:      php-pear(%{pear_name}2) < 3.0.0
+Provides:       php-pear(%{pear_name}2) = %{version}
 
-%description -l fr
-PHPUnit est un outil de test de rÃ©gression utilisÃ© par les dÃ©veloppeurs
-qui construise des tests unitaires en PHP. Cette version Ã©tait utilisÃ©e
-avec PHP4.
+%description
+PHPUnit is a family of PEAR packages that supports the development of
+object-oriented PHP applications using the concepts and methods of Agile
+Software Development, Extreme Programming, Test-Driven Development and
+Design-by-Contract Development by providing an elegant and robust framework
+for the creation, execution and analysis of Unit Tests.
 
-Les developpeurs devraient utiliser PHPUnit2 avec PHP5.
 
 %prep
-%setup -q -c
+%setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 cd %{pear_name}-%{version}
 
+
 %build
 cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
+rm -rf $RPM_BUILD_ROOT docdir
+
+# Install Package
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
+# Move documentation
+mkdir -p docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
@@ -57,27 +69,65 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
+# Unregister pear.php.net/PHPUnit, new PHPUnit is in another channel
+if [ $1 -gt  1 ] ; then
+%{__pear} uninstall --nodeps --ignore-errors --register-only \
+    %{pear_name} >/dev/null || :
+fi
+
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        %{pear_name} >/dev/null || :
+        %{channel}/%{pear_name} >/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG
+%doc %{pear_name}-%{version}/docdir/%{pear_name}/%{pear_name}/*
 %{pear_xmldir}/%{pear_name}.xml
-%{pear_phpdir}/PHPUnit
-%{pear_phpdir}/PHPUnit.php
+%{pear_testdir}/%{pear_name}
+%{pear_phpdir}/%{pear_name}
+%{pear_phpdir}/%{pear_name}2
+%{_bindir}/phpunit
+
 
 %changelog
-* Mon Oct  2 2006 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-1
-- generated specfile (pear make-rpm-spec) + cleaning
-- add french summary and description
+* Thu Mar 08 2007 Christopher Stone <chris.stone at gmail.com> 3.0.5-3
+- Fix testdir
+- Fix Provides version
+
+* Wed Mar 07 2007 Christopher Stone <chris.stone at gmail.com> 3.0.5-2
+- Add Obsoletes/Provides for php-pear(PHPUnit2)
+- Requires php-pear(PEAR) >= 1.5.0
+- Own %%{pear_testdir}/%%{pear_name}
+- Remove no longer needed manual channel install
+- Simplify %%doc
+- Only unregister old phpunit on upgrade
+
+* Mon Feb 26 2007 Christopher Stone <chris.stone at gmail.com> 3.0.5-1
+- Upstream sync
+
+* Wed Feb 21 2007 Christohper Stone <chris.stone at gmail.com> 3.0.4-1
+- Upstream sync
+
+* Mon Jan 29 2007 Christopher Stone <chris.stone at gmail.com> 3.0.3-1
+- Upstream sync
+
+* Sun Jan 14 2007 Christopher Stone <chris.stone at gmail.com> 3.0.2-1
+- Upstream sync
+
+* Fri Jan 05 2007 Christopher Stone <chris.stone at gmail.com> 3.0.1-1
+- Upstream sync
+
+* Wed Dec 27 2006 Christopher Stone <chris.stone at gmail.com> 3.0.0-1
+- Initial Release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHPUnit/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2006 05:25:49 -0000	1.2
+++ sources	12 Mar 2007 19:34:13 -0000	1.3
@@ -1 +1 @@
-4b9dd2158e4035318481c93bbd59aaa5  PHPUnit-1.3.2.tgz
+fca4887ed95996a4b18e0cb0b8ff8130  PHPUnit-3.0.5.tgz


