From e226460b01c1019fdab2d19688a11b0a656a338f Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 12 Jan 2013 16:46:01 +0100 Subject: [PATCH] - upstream 1.4.3 - use php_metadir --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 17 ++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index d75cf87..95ac2e1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ 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 diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 0383d69..ed43567 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/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.3 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,16 @@ 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 %{_bindir}/phpcs %changelog +* Sat Jan 12 2013 Christof Damian - 1.4.3-1 +- upstream 1.4.3 +- use php_metadir + * Fri Oct 12 2012 Christof Damian - 1.4.0-1 - upstream 1.4.0 diff --git a/sources b/sources index e889e5f..561a068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a299051c1dfa3d10ca198d0523e557e7 PHP_CodeSniffer-1.4.0.tgz +5183c6f31cb154f4adbc4f7044a79645 PHP_CodeSniffer-1.4.3.tgz