rpms/php-pear-PHP-CodeSniffer/EL-5 .cvsignore, 1.8, 1.9 php-pear-PHP-CodeSniffer.spec, 1.7, 1.8 sources, 1.8, 1.9

[Christof Damian]

Author: cdamian

Update of /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19341

Modified Files:
	.cvsignore php-pear-PHP-CodeSniffer.spec sources 
Log Message:
- upstream 1.2.2 ( bug:559170 )
- move phpcs into main package ( bug: 517775 )
- add php-common version requirement



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	17 Nov 2009 18:28:59 -0000	1.8
+++ .cvsignore	27 Jan 2010 20:40:02 -0000	1.9
@@ -1 +1,2 @@
-PHP_CodeSniffer-1.2.1.tgz
+PHP_CodeSniffer-1.2.2.tgz
+PHP_CodeSniffer-licence.txt


Index: php-pear-PHP-CodeSniffer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/EL-5/php-pear-PHP-CodeSniffer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- php-pear-PHP-CodeSniffer.spec	17 Nov 2009 18:28:59 -0000	1.7
+++ php-pear-PHP-CodeSniffer.spec	27 Jan 2010 20:40:02 -0000	1.8
@@ -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}-%{ve
 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_BU
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
@@ -87,24 +78,38 @@ 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 <christof at damian.net> 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 <christof at damian.net> - 1.2.1-1
 - Upstream 1.2.1
 
+* Sat Sep 19 2009 Christof Damian <christof at damian.net> - 1.2.0-1
+- Upstream 1.2.0
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar 05 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.1.0-1
+- Belatedly update to 1.1.0 final.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-0.2.RC2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Jun 30 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.1.0-0.1.RC2
+- Upstream 1.1.0RC2
+
 * Sun Feb 17 2008 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.0.1-1
 - Upstream 1.0.1
 - Move sample config into docs


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	17 Nov 2009 18:28:59 -0000	1.8
+++ sources	27 Jan 2010 20:40:02 -0000	1.9
@@ -1 +1,2 @@
-942701faf162c0febc6e6868cc3ad79d  PHP_CodeSniffer-1.2.1.tgz
+b734e066105d052fde564ab5e6be7091  PHP_CodeSniffer-1.2.2.tgz
+09df23a638e665feddffb575f7a623dc  PHP_CodeSniffer-licence.txt