Merge branch 'master' into el6

Conflicts:
	.gitignore
	php-pear-PHP-CodeSniffer.spec
	sources

.gitignore

@@ -1,2 +1,4 @@
-PHP_CodeSniffer-1.2.2.tgz
-PHP_CodeSniffer-licence.txt
+PHP_CodeSniffer-1.3.0a1.tgz
+/PHP_CodeSniffer-1.3.0RC1.tgz
+/PHP_CodeSniffer-1.3.0.tgz
+/PHP_CodeSniffer-1.3.1.tgz

php-pear-PHP-CodeSniffer.spec

@@ -1,15 +1,16 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name PHP_CodeSniffer
+%global pear_name     PHP_CodeSniffer
+%global pear_version  1.3.1
 
 Name:           php-pear-PHP-CodeSniffer
-Version:        1.2.2
+Version:        %{pear_version}
 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/PHP_CodeSniffer-%{version}.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)
 
@@ -19,6 +20,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}
@@ -30,17 +32,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_name}.xml
 
+cd %{pear_name}-%{pear_version}
+
+# 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}
 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
@@ -77,9 +85,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}/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}
@@ -87,6 +95,28 @@ fi
 %{_bindir}/phpcs
 
 %changelog
+* Thu Nov  3 2011 Christof Damian <christof@damian.net> - 1.3.1-1
+- upstream 1.3.1
+
+* Fri Mar 18 2011 Christof Damian <christof@damian.net> - 1.3.0final-1
+- fix my version foo until 1.3.1
+
+* Fri Mar 18 2011 Christof Damian <christof@damian.net> - 1.3.0-1
+- upstream 1.3.0 final
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-3.RC1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sat Dec  4 2010 Christof Damian <christof@damian.net> - 1.3.0-2.RC1
+- fix version number 
+- fix timezone warnings
+
+* Fri Sep  3 2010 Christof Damian <christof@damian.net> - 1.3.0RC1-1
+- upstream 1.3.0RC1
+
+* Thu Jul 15 2010 Christof Damian <christof@damian.net> - 1.3.0a1-1
+- upstream 1.3.0a1
+
 * Wed Jan 27 2010 Christof Damian <christof@damian.net> 1.2.2-1
 - upstream 1.2.2 ( bug:559170 )
 - move phpcs into main package ( bug: 517775 )

sources

@@ -1,2 +1 @@
-b734e066105d052fde564ab5e6be7091  PHP_CodeSniffer-1.2.2.tgz
-09df23a638e665feddffb575f7a623dc  PHP_CodeSniffer-licence.txt
+2a1e54fb791545bac0fabc4009e19afb  PHP_CodeSniffer-1.3.1.tgz