From bbb6e46ed548a96d125b167f07f8523cb545bbde Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 09:34:53 +0000 Subject: [PATCH 1/4] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 3adb8d1591a153e12933c252ce5dc55445b4b15a Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Sun, 17 Feb 2008 20:30:37 +0000 Subject: [PATCH 2/4] New upstream 1.0.1 and related adjustments. --- .cvsignore | 2 +- php-pear-PHP-CodeSniffer.spec | 19 ++++++++++++++----- sources | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0fcb2ee..27dced3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PHP_CodeSniffer-0.8.0.tgz +PHP_CodeSniffer-1.0.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 3beb3aa..b08dd41 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: 0.8.0 +Version: 1.0.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -43,6 +43,8 @@ cd %{pear_name}-%{version} %build +cd %{pear_name}-%{version} +# Empty build section, %install @@ -50,9 +52,10 @@ cd %{pear_name}-%{version} rm -rf $RPM_BUILD_ROOT docdir %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml -# Move documentation (none packaged so far) -# mkdir -p docdir -# mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir +# Move documentation +mkdir -p docdir +mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/*.sample.conf docdir/ + cp %{SOURCE1} . # Clean up unnecessary files @@ -80,11 +83,13 @@ fi %files %defattr(-,root,root,-) -%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt +%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 %{pear_phpdir}/PHP/* +%dir %{pear_datadir}/%{pear_name} %files -n phpcs %defattr(-,root,root,-) @@ -93,6 +98,10 @@ fi %changelog +* Sun Feb 17 2008 Konstantin Ryabitsev - 1.0.1-1 +- Upstream 1.0.1 +- Move sample config into docs + * Fri Aug 17 2007 Konstantin Ryabitsev - 0.8.0-1 - Upstream 0.8.0 diff --git a/sources b/sources index cfce90f..2a6e19d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a106c8c1abfc35ba590d6bc0f7e2acff PHP_CodeSniffer-0.8.0.tgz +500a5fc5236190217c579548304f7155 PHP_CodeSniffer-1.0.1.tgz From 94ba87033111cf80e5ed3b6f3f77221f05c6beb0 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 df433b1c303c0ddfd3a3379d98edefee0ddb2a9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:05:41 +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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8