diff --git a/.gitignore b/.gitignore index 30e624b..9b20fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.0RC1.tgz +/PHP_CodeSniffer-1.3.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index fb5542d..2262f20 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,17 +1,16 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name PHP_CodeSniffer %global pear_version 1.3.0 -%global pear_release RC1 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 3.%{pear_release}%{?dist} +Release: 1%{?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/%{pear_name}-%{pear_version}%{pear_release}.tgz +Source0: http://pear.php.net/get/%{pear_name}-%{pear_version}.tgz Source1: PHP_CodeSniffer-licence.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,8 +25,6 @@ Provides: php-pear(%{pear_name}) = %{version} Provides: phpcs = %{version} Obsoletes: phpcs < %{version} -# optional: PHP_Timer, which is up for review at the moment - %description PHP_CodeSniffer provides functionality to verify that code conforms to certain standards, such as PEAR, or user-defined. @@ -35,9 +32,9 @@ 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}-%{pear_version}%{pear_release}/%{pear_name}.xml +mv package2.xml %{pear_name}-%{pear_version}/%{pear_name}.xml -cd %{pear_name}-%{pear_version}%{pear_release} +cd %{pear_name}-%{pear_version} # Create a "localized" php.ini to avoid build warning cp /etc/php.ini . @@ -48,7 +45,7 @@ echo "date.timezone=UTC" >>php.ini %install -cd %{pear_name}-%{pear_version}%{pear_release} +cd %{pear_name}-%{pear_version} rm -rf $RPM_BUILD_ROOT docdir PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml @@ -88,9 +85,9 @@ fi %files %defattr(-,root,root,-) -%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/* +%doc %{pear_name}-%{pear_version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{pear_version}/phpcs-svn-pre-commit +%doc %{pear_name}-%{pear_version}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %{pear_datadir}/%{pear_name} @@ -98,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Fri Mar 18 2011 Christof Damian - 1.3.0-1 +- upstream 1.3.0 final + * Wed Feb 09 2011 Fedora Release Engineering - 1.3.0-3.RC1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 9dc436d..d13b798 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -122a7a413866df608d87e0e5a868aeda PHP_CodeSniffer-1.3.0RC1.tgz +49f1b9dd4e5b0d01703430d361f4c730 PHP_CodeSniffer-1.3.0.tgz