From cb1c128118121460ea1ddc34493909b30f5ead3a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:11:32 +0000 Subject: [PATCH 1/4] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 2c912e19b4555a24e70d9b466a1155ce538adb5c Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Fri, 6 Mar 2009 04:19:44 +0000 Subject: [PATCH 2/4] Belatedly update to 1.1.0 final. --- .cvsignore | 2 +- php-pear-PHP-CodeSniffer.spec | 23 ++++++++++++++--------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5ecb5ed..c2f22a0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PHP_CodeSniffer-1.1.0RC2.tgz +PHP_CodeSniffer-1.1.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index a80f2c3..56d6ade 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,16 +1,15 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %define pear_name PHP_CodeSniffer -%define rctag RC2 Name: php-pear-PHP-CodeSniffer Version: 1.1.0 -Release: 0.1.%{rctag}%{?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/PHP_CodeSniffer-%{version}%{rctag}.tgz +Source0: http://pear.php.net/get/PHP_CodeSniffer-%{version}.tgz Source1: PHP_CodeSniffer-licence.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,7 +38,7 @@ This package includes a utility to run PHP_CodeSniffer from command line. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}%{rctag}/%{pear_name}.xml +mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml %build @@ -47,7 +46,7 @@ mv package2.xml %{pear_name}-%{version}%{rctag}/%{pear_name}.xml %install -cd %{pear_name}-%{version}%{rctag} +cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml @@ -87,8 +86,8 @@ fi %files %defattr(-,root,root,-) -%doc %{pear_name}-%{version}%{rctag}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}%{rctag}/docdir/* +%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{version}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %dir %{pear_phpdir}/PHP @@ -97,12 +96,18 @@ fi %files -n phpcs %defattr(-,root,root,-) -%doc %{pear_name}-%{version}%{rctag}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}%{rctag}/phpcs-svn-pre-commit +%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{version}/phpcs-svn-pre-commit %{_bindir}/phpcs %changelog +* Thu Mar 05 2009 Konstantin Ryabitsev - 1.1.0-1 +- Belatedly update to 1.1.0 final. + +* Thu Feb 26 2009 Fedora Release Engineering - 1.1.0-0.2.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Jun 30 2008 Konstantin Ryabitsev - 1.1.0-0.1.RC2 - Upstream 1.1.0RC2 diff --git a/sources b/sources index 97c78c1..6a93018 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7b10489c21b73e56b67cfa967eb1672 PHP_CodeSniffer-1.1.0RC2.tgz +b5f727311b091ee6b6edf8ffcc411e71 PHP_CodeSniffer-1.1.0.tgz From e5ad3ff47d199144fb216ad7da4d3f636a645f15 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:59:22 +0000 Subject: [PATCH 3/4] 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 f109988902bbc9ee39375b1066f1451677fe3e96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:05:45 +0000 Subject: [PATCH 4/4] 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10