rpms/php-pear-PHP-CodeSniffer/devel .cvsignore, 1.12, 1.13 php-pear-PHP-CodeSniffer.spec, 1.13, 1.14 sources, 1.12, 1.13
Christof Damian
cdamian at fedoraproject.org
Wed Jan 27 20:15:28 UTC 2010
Author: cdamian
Update of /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16912
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/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 17 Nov 2009 07:30:06 -0000 1.12
+++ .cvsignore 27 Jan 2010 20:15:27 -0000 1.13
@@ -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/devel/php-pear-PHP-CodeSniffer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- php-pear-PHP-CodeSniffer.spec 17 Nov 2009 07:30:06 -0000 1.13
+++ php-pear-PHP-CodeSniffer.spec 27 Jan 2010 20:15:27 -0000 1.14
@@ -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,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 <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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CodeSniffer/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 17 Nov 2009 07:30:06 -0000 1.12
+++ sources 27 Jan 2010 20:15:28 -0000 1.13
@@ -1 +1,2 @@
-942701faf162c0febc6e6868cc3ad79d PHP_CodeSniffer-1.2.1.tgz
+b734e066105d052fde564ab5e6be7091 PHP_CodeSniffer-1.2.2.tgz
+09df23a638e665feddffb575f7a623dc PHP_CodeSniffer-licence.txt
More information about the scm-commits
mailing list