diff --git a/.gitignore b/.gitignore index 73400cb..30e624b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ PHP_CodeSniffer-1.3.0a1.tgz +/PHP_CodeSniffer-1.3.0RC1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index f5104b2..0ee5765 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,15 +1,17 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%define pear_name PHP_CodeSniffer +%global pear_name PHP_CodeSniffer +%global pear_version 1.3.0 +%global pear_release RC1 Name: php-pear-PHP-CodeSniffer -Version: 1.3.0a1 -Release: 1%{?dist} +Version: %{pear_version} +Release: 2.%{pear_release}%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer -Source0: http://pear.php.net/get/PHP_CodeSniffer-%{version}.tgz +Source0: http://pear.php.net/get/%{pear_name}-%{pear_version}%{pear_release}.tgz Source1: PHP_CodeSniffer-licence.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,6 +21,7 @@ Requires: php-pear(PEAR) Requires: php-common >= 5.1.2 Requires(post): %{__pear} Requires(postun): %{__pear} +Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0 Provides: php-pear(%{pear_name}) = %{version} Provides: phpcs = %{version} Obsoletes: phpcs < %{version} @@ -32,17 +35,23 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +mv package2.xml %{pear_name}-%{pear_version}%{pear_release}/%{pear_name}.xml +cd %{pear_name}-%{pear_version}%{pear_release} + +# Create a "localized" php.ini to avoid build warning +cp /etc/php.ini . +echo "date.timezone=UTC" >>php.ini %build # Empty build section, %install -cd %{pear_name}-%{version} +cd %{pear_name}-%{pear_version}%{pear_release} rm -rf $RPM_BUILD_ROOT docdir -%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml + +PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Move documentation mkdir -p docdir @@ -79,9 +88,9 @@ fi %files %defattr(-,root,root,-) -%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}/phpcs-svn-pre-commit -%doc %{pear_name}-%{version}/docdir/* +%doc %{pear_name}-%{pear_version}%{pear_release}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{pear_version}%{pear_release}/phpcs-svn-pre-commit +%doc %{pear_name}-%{pear_version}%{pear_release}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %{pear_datadir}/%{pear_name} @@ -89,6 +98,13 @@ fi %{_bindir}/phpcs %changelog +* Sat Dec 4 2010 Christof Damian - 1.3.0-2.RC1 +- fix version number +- fix timezone warnings + +* Fri Sep 3 2010 Christof Damian - 1.3.0RC1-1 +- upstream 1.3.0RC1 + * Thu Jul 15 2010 Christof Damian - 1.3.0a1-1 - upstream 1.3.0a1 diff --git a/sources b/sources index a854aff..9dc436d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1b19d7b793d01bce9241ce5e2254395 PHP_CodeSniffer-1.3.0a1.tgz +122a7a413866df608d87e0e5a868aeda PHP_CodeSniffer-1.3.0RC1.tgz