From 2d36dce5891b6f5aed66cd834b178a15c32978ef Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 06:24:05 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for php-pear-PHP-CodeSniffer --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 18676f7dd48682674c58f5072628e92c892cc21a Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Tue, 17 Nov 2009 07:37:04 +0000 Subject: [PATCH 2/5] upstream 1.2.1 --- .cvsignore | 2 +- php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ac6fd06..d28f41c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PHP_CodeSniffer-1.2.0.tgz +PHP_CodeSniffer-1.2.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 498df02..367dbf1 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -2,7 +2,7 @@ %define pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -102,6 +102,9 @@ fi %changelog +* Tue Nov 17 2009 Christof Damian - 1.2.1-1 +- Upstream 1.2.1 + * Sat Sep 19 2009 Christof Damian - 1.2.0-1 - Upstream 1.2.0 diff --git a/sources b/sources index 0df2690..26bd309 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd1caaf2741e4dc04d844bb306993898 PHP_CodeSniffer-1.2.0.tgz +942701faf162c0febc6e6868cc3ad79d PHP_CodeSniffer-1.2.1.tgz From 472eda583af6886052b5d9de1a495bcb790f23d3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:59:22 +0000 Subject: [PATCH 3/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 24dd3e6..7fd3e60 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: php-pear-PHP-CodeSniffer -# $Id$ +# $Id: Makefile,v 1.1 2007/01/30 01:33:58 icon Exp $ NAME := php-pear-PHP-CodeSniffer SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0269b79023b9ca441f59f0be897a775437cd9f10 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Wed, 27 Jan 2010 20:21:43 +0000 Subject: [PATCH 4/5] - upstream 1.2.2 ( bug:559170 ) - move phpcs into main package ( bug: 517775 ) - add php-common version requirement --- .cvsignore | 3 ++- php-pear-PHP-CodeSniffer.spec | 34 ++++++++++++---------------------- sources | 3 ++- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index d28f41c..daae2bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -PHP_CodeSniffer-1.2.1.tgz +PHP_CodeSniffer-1.2.2.tgz +PHP_CodeSniffer-licence.txt diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 367dbf1..cf0f345 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -2,7 +2,7 @@ %define pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -16,25 +16,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php-pear >= 1:1.4.9-1.2 Requires: php-pear(PEAR) +Requires: php-common >= 5.1.2 Requires(post): %{__pear} Requires(postun): %{__pear} Provides: php-pear(%{pear_name}) = %{version} +Provides: phpcs = %{version} +Obsoletes: phpcs < %{version} %description PHP_CodeSniffer provides functionality to verify that code conforms to certain standards, such as PEAR, or user-defined. - -%package -n phpcs -Summary: Command-line utility for PHP-CodeSniffer -Group: Development/Tools -Requires: php-pear(%{pear_name}) = %{version} -Requires: php-cli - -%description -n phpcs -This package includes a utility to run PHP_CodeSniffer from command line. - - %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml @@ -72,7 +64,6 @@ install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir} %clean rm -rf $RPM_BUILD_ROOT - %post %{__pear} install --nodeps --soft --force --register-only \ %{pear_xmldir}/%{pear_name}.xml >/dev/null || : @@ -87,21 +78,20 @@ 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/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} -%dir %{pear_phpdir}/PHP -%{pear_phpdir}/PHP/* -%dir %{pear_datadir}/%{pear_name} - -%files -n phpcs -%defattr(-,root,root,-) -%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}/phpcs-svn-pre-commit +%{pear_datadir}/%{pear_name} +%{pear_phpdir}/PHP %{_bindir}/phpcs - %changelog +* Wed Jan 27 2010 Christof Damian 1.2.2-1 +- upstream 1.2.2 ( bug:559170 ) +- move phpcs into main package ( bug: 517775 ) +- add php-common version requirement + * Tue Nov 17 2009 Christof Damian - 1.2.1-1 - Upstream 1.2.1 diff --git a/sources b/sources index 26bd309..88252ba 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -942701faf162c0febc6e6868cc3ad79d PHP_CodeSniffer-1.2.1.tgz +b734e066105d052fde564ab5e6be7091 PHP_CodeSniffer-1.2.2.tgz +09df23a638e665feddffb575f7a623dc PHP_CodeSniffer-licence.txt From 451823ba203be4d72ce23381a8f6c54639064af5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:05:44 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7fd3e60..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: php-pear-PHP-CodeSniffer -# $Id: Makefile,v 1.1 2007/01/30 01:33:58 icon Exp $ -NAME := php-pear-PHP-CodeSniffer -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12