[php-bartlett-PHP-CompatInfo/f17] update to 2.12.1
Remi Collet
remi at fedoraproject.org
Fri Jan 18 12:43:48 UTC 2013
commit f396cd925f1cc282b3fa332f5ab286537cb6cf9d
Author: Remi Collet <remi at fedoraproject.org>
Date: Fri Jan 18 13:43:39 2013 +0100
update to 2.12.1
.gitignore | 2 +
PHP_CompatInfo-addhtml.patch | 14 -------
PHP_CompatInfo-del.patch | 16 --------
php-bartlett-PHP-CompatInfo.spec | 75 ++++++++++++--------------------------
sources | 2 +-
5 files changed, 27 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f869ff..84d6f31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ package-*.xml
/PHP_CompatInfo-2.7.0.tgz
/PHP_CompatInfo-2.8.0.tgz
/PHP_CompatInfo-2.8.1.tgz
+/PHP_CompatInfo-2.11.0.tgz
+/PHP_CompatInfo-2.12.1.tgz
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 2033ca5..f3ddc6a 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -3,18 +3,12 @@
%global pear_name PHP_CompatInfo
%global channel bartlett.laurent-laville.org
-%if 0%{?fedora} >= 15
-%global withhtmldoc 1
-%else
-%global withhtmldoc 0
-%endif
-
-# TODO : link /usr/share/pear/data/PHP_CompatInfo/misc/jquery-1.5.min.js
+# TODO : link /usr/share/pear/data/PHP_CompatInfo/misc/jquery-min.js
# to system jquery when available, then fix License (BSD only)
Name: php-bartlett-PHP-CompatInfo
-Version: 2.8.1
+Version: 2.12.1
Release: 1%{?dist}
Summary: Find out version and the extensions required for a piece of code to run
@@ -24,36 +18,30 @@ License: BSD and MIT
URL: http://php5.laurent-laville.org/compatinfo/
Source0: http://bartlett.laurent-laville.org/get/%{pear_name}-%{version}%{?prever}.tgz
-# Remove unused asciidoc*.js scripts
-Patch1: %{pear_name}-del.patch
-# Install generated doc using pear command
-Patch2: %{pear_name}-addhtml.patch
-
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear(PEAR) >= 1.9.0
BuildRequires: php-channel(%{channel})
# to run test suite
BuildRequires: php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0
-BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 1.4.2
-%if %{withhtmldoc}
-# to build HTML documentation
-BuildRequires: php-pear(pear.phing.info/phing)
-BuildRequires: asciidoc >= 8.4.0
-%endif
+BuildRequires: php-pear(%{channel}/PHP_Reflect) >= 1.5.0
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Requires: php-xml >= 5.2.0
+Requires: php-common >= 5.2.1
+Requires: php-date
+Requires: php-dom
+Requires: php-libxml
+Requires: php-pcre
+Requires: php-reflection
+Requires: php-spl
Requires: php-pear(PEAR) >= 1.9.0
-Requires: php-pear(%{channel}/PHP_Reflect) >= 1.3.0
-Requires: php-pear(Console_CommandLine) >= 1.1.3
-Requires: php-pear(components.ez.no/ConsoleTools) >= 1.6.1
-Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.5.0
+Requires: php-pear(%{channel}/PHP_Reflect) >= 1.5.0
+Requires: php-pear(Console_CommandLine) >= 1.2.0
+# Optional
+Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.6.0
+Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0
# Optional and not yet availalble php-pear(Net_Growl) >= 2.2.2
-# php-pear(components.ez.no/Base) required by ConsoleTools
-# php-pear(pear.phpunit.de/PHP_Timer) required by PHPUnit
Provides: php-pear(%{channel}/%{pear_name}) = %{version}%{?prever}
@@ -64,9 +52,7 @@ version and extensions required for it to run. CLI version has many reports
(extension, interface, class, function, constant) to display and ability to
show content of dictionary references.
-%if %{withhtmldoc}
-HTML Documentation: %{pear_docdir}/%{pear_name}/docs/index.html
-%endif
+HTML Documentation: %{pear_docdir}/%{pear_name}/html/index.html
%prep
@@ -76,30 +62,10 @@ HTML Documentation: %{pear_docdir}/%{pear_name}/docs/index.html
cd %{pear_name}-%{version}%{?prever}
mv -f ../package.xml %{name}.xml
-%patch1 -p1 -b .del
-%if %{withhtmldoc}
-%patch2 -p1 -b .addhtml
-%endif
-
%build
cd %{pear_name}-%{version}%{?prever}
-%if %{withhtmldoc}
-# Generate the HTML documentation
-phing -f docs/build-phing.xml \
- -Dhomedir=$PWD \
- -Dasciidoc.home=%{_datadir}/asciidoc \
- -Doutput.dir=$PWD/docs \
- -Dbuild.tarball=false \
- make-html-docs
-
-# asciidoc fails silently
-cpt=$(find docs -name \*.html | wc -l)
-echo "File generated:$cpt, expected:5"
-[ $cpt -eq 5 ] || exit 1
-%endif
-
%install
rm -rf %{buildroot}
@@ -115,7 +81,6 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
# Fix wrong-script-end-of-line-encoding
sed -i -e 's/\r//' %{buildroot}%{_bindir}/phpci
-sed -i -e 's/\r//' %{buildroot}%{pear_docdir}/%{pear_name}/README.markdown
# Create default package configuration
sed -e '/reference=/s/PHP5/ALL/' \
@@ -175,6 +140,14 @@ fi
%changelog
+* Fri Jan 18 2013 Remi Collet <remi at fedoraproject.org> - 2.12.1-1
+- update to Version 2.12.1
+- fix path to documentation in description
+- drop dependency on eZ components
+- raise PHPUnit dependency to 3.6.0
+- html documentation is now provided by upstream
+- raise dependencies, PHP_Reflect 1.5.0, Console_CommandLine 1.2.0
+
* Sat Sep 29 2012 Remi Collet <remi at fedoraproject.org> - 2.8.1-1
- Version 2.8.1 (stable) - API 2.8.0 (stable)
diff --git a/sources b/sources
index 0519aa3..d6eb7c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a56823472ff093da9f6477a6b5e5721 PHP_CompatInfo-2.8.1.tgz
+adce86e1c39481788eead11e51528d2f PHP_CompatInfo-2.12.1.tgz
More information about the scm-commits
mailing list