Merge branch 'master' into el6

.gitignore

@@ -7,3 +7,5 @@ PHP_CodeSniffer-1.3.0a1.tgz
 /PHP_CodeSniffer-1.3.5.tgz
 /PHP_CodeSniffer-1.3.6.tgz
 /PHP_CodeSniffer-1.4.0.tgz
+/PHP_CodeSniffer-1.4.3.tgz
+/PHP_CodeSniffer-1.4.4.tgz

php-pear-PHP-CodeSniffer.spec

@@ -1,6 +1,7 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %global pear_name     PHP_CodeSniffer
-%global pear_version  1.4.0
+%global pear_version  1.4.4
 
 Name:           php-pear-PHP-CodeSniffer
 Version:        %{pear_version}
@@ -46,14 +47,10 @@ echo "date.timezone=UTC" >>php.ini
 
 %install
 cd %{pear_name}-%{pear_version}
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT 
 
 PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/*.sample.conf docdir/
-
 # Remove phpcs-svn-pre-commit: we'll add it to docs
 mv  -f $RPM_BUILD_ROOT%{_bindir}/scripts/phpcs-svn-pre-commit .
 chmod 0644 phpcs-svn-pre-commit
@@ -62,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/scripts
 cp %{SOURCE1} .
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}/%{pear_metadir}/.??* 
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
@@ -87,14 +84,23 @@ fi
 %defattr(-,root,root,-)
 %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}
 %{pear_phpdir}/PHP
+%{pear_datadir}/%{pear_name}/CodeSniffer.conf.dist
 %{_bindir}/phpcs
 
 %changelog
+* Mon Feb 25 2013 Christof Damian <christof@damian.net> - 1.4.4-1
+- upstream 1.4.4
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Jan 12 2013 Christof Damian <christof@damian.net> - 1.4.3-1
+- upstream 1.4.3
+- use php_metadir
+
 * Fri Oct 12 2012 Christof Damian <christof@damian.net> - 1.4.0-1
 - upstream 1.4.0
 

sources

@@ -1 +1 @@
-a299051c1dfa3d10ca198d0523e557e7  PHP_CodeSniffer-1.4.0.tgz
+cf6e9a74ac10c1a61106257be27a322c  PHP_CodeSniffer-1.4.4.tgz