[fedora-review] Fix requires for licensecheck (#1016309)

[Stanislav Ochotnicky]

commit 0cf9690f48fb1d82ea30b826e8a77bcb010d3834
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Oct 14 11:25:53 2013 +0200

    Fix requires for licensecheck (#1016309)
    
    - Remove separate php plugin subpackage (#971875)

 fedora-review.spec |   33 +++++++++++++--------------------
 1 files changed, 13 insertions(+), 20 deletions(-)
---
diff --git a/fedora-review.spec b/fedora-review.spec
index 2a88e11..c66909e 100644
--- a/fedora-review.spec
+++ b/fedora-review.spec
@@ -6,7 +6,7 @@
 
 Name:       fedora-review
 Version:    0.5.0
-Release:    1%{?git_tag}%{?dist}
+Release:    2%{?git_tag}%{?dist}
 Summary:    Review tool for fedora rpm packages
 
 License:    GPLv2+
@@ -30,12 +30,16 @@ Requires:       python-bugzilla
 Requires:       python-kitchen
 Requires:       python-straight-plugin
 Requires:       rpm-python
-Requires:       rpmdevtools
+# licensecheck used to be in rpmdevtools, moved to devscripts later
+# this is compatible with both situations without ifdefs
+Requires:       %{_bindir}/licensecheck
 Requires:       yum-utils
 
 # Let's be consistent with the name used on fedorahosted
 provides:       FedoraReview = %{version}-%{release}
 
+Provides:       %{name}-php-phpci = %{version}-%{release}
+Obsoletes:      %{name}-php-phpci < %{version}-%{release}
 
 %description
 This tool automates much of the dirty work when reviewing a package
@@ -63,20 +67,9 @@ Requires: %{name} = %{version}-%{release}
 Tests are packaged separately due to space concerns.
 
 
-%package php-phpci
-Summary:  Run phpci static analyzer on php packages
-Requires: %{name} = %{version}-%{release}
-Requires: php-bartlett-PHP-CompatInfo
-
-%description php-phpci
-Bash plugin running the phpci static analyzer on php packages,
-see http://php5.laurent-laville.org/compatinfo/.
-
-
 %prep
 %setup -q
 
-
 %build
 %{__python} setup.py --quiet build
 
@@ -98,9 +91,9 @@ cp -ar test "$RPM_BUILD_ROOT%{_datadir}/%{name}"
 cd test
 export REVIEW_LOGLEVEL=warning
 export MAKE_RELEASE=1
-mock --quiet -r fedora-17-i386 --init
-mock --quiet -r fedora-16-i386 --init
-mock --quiet -r fedora-17-i386 --uniqueext=hugo --init
+mock --quiet -r fedora-19-i386 --init
+mock --quiet -r fedora-18-i386 --init
+mock --quiet -r fedora-19-i386 --uniqueext=hugo --init
 python -m unittest discover -f
 %endif
 
@@ -116,17 +109,17 @@ python -m unittest discover -f
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/plugins
 %{_datadir}/%{name}/scripts
-%exclude %{_datadir}/%{name}/scripts/php-phpci.sh
 
 %files tests
 %doc test/README.test
 %{_datadir}/%{name}/test
 
-%files php-phpci
-%{_datadir}/%{name}/scripts/php-phpci.sh
-
 
 %changelog
+* Mon Oct 14 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.5.0-2
+- Fix requires for licensecheck (#1016309)
+- Remove separate php plugin subpackage (#971875)
+
 * Fri Aug 30 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.5.0-1
 - Updating to upstream 0.5.0