[php-bartlett-PHP-CompatInfo/f18] Update to 2.14.1, make cache path user dependent

Remi Collet remi at fedoraproject.org
Tue Apr 2 11:29:38 UTC 2013


commit e599775f6b38a48f893f574ada4fb6f8eaa7f1dd
Author: Remi Collet <remi at fedoraproject.org>
Date:   Tue Apr 2 13:29:07 2013 +0200

    Update to 2.14.1, make cache path user dependent

 .gitignore                       |    1 +
 php-bartlett-PHP-CompatInfo.spec |   21 +++++++++++++++++----
 sources                          |    2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80e4b02..c7c81aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ package-*.xml
 /PHP_CompatInfo-2.13.0.tgz
 /PHP_CompatInfo-2.13.2.tgz
 /PHP_CompatInfo-2.14.0.tgz
+/PHP_CompatInfo-2.14.1.tgz
diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec
index 9b8eb90..474ce59 100644
--- a/php-bartlett-PHP-CompatInfo.spec
+++ b/php-bartlett-PHP-CompatInfo.spec
@@ -8,7 +8,7 @@
 
 
 Name:           php-bartlett-PHP-CompatInfo
-Version:        2.14.0
+Version:        2.14.1
 Release:        1%{?dist}
 Summary:        Find out version and the extensions required for a piece of code to run
 
@@ -18,6 +18,11 @@ License:        BSD and MIT
 URL:            http://php5.laurent-laville.org/compatinfo/
 Source0:        http://bartlett.laurent-laville.org/get/%{pear_name}-%{version}%{?prever}.tgz
 
+# Update configuration for best experience
+# Reference = ALL known extension (instead of installed ones)
+# Make cache / save_path user specific
+Patch0:         %{pear_name}-conf.patch
+
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.2.1
 BuildRequires:  php-pear(PEAR) >= 1.9.0
@@ -61,6 +66,12 @@ HTML Documentation:  %{pear_docdir}/%{pear_name}/html/index.html
 
 # Package is V2
 cd %{pear_name}-%{version}%{?prever}
+
+# Copy upstream default configuration
+cp phpcompatinfo.xml.dist phpcompatinfo.xml
+# Apply our changes
+%patch0  -p1 -b .rpm
+
 mv -f ../package.xml %{name}.xml
 
 
@@ -83,9 +94,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 sed -i -e 's/\r//' %{buildroot}%{_bindir}/phpci
 
 # Create default package configuration
-sed -e '/reference=/s/PHP5/ALL/' \
-     %{buildroot}%{pear_cfgdir}/%{pear_name}/phpcompatinfo.xml.dist \
-    >%{buildroot}%{pear_cfgdir}/%{pear_name}/phpcompatinfo.xml
+install -pm 644 phpcompatinfo.xml %{buildroot}%{pear_cfgdir}/%{pear_name}/
 
 
 %check
@@ -139,6 +148,10 @@ fi
 
 
 %changelog
+* Tue Apr 02 2013 Remi Collet <remi at fedoraproject.org> - 2.14.1-1
+- Update to 2.14.1
+- make cache path user dependent
+
 * Mon Mar 18 2013 Remi Collet <remi at fedoraproject.org> - 2.14.0-1
 - Update to 2.14.0
 
diff --git a/sources b/sources
index 3a19886..a93b105 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4eafda9d5e534a45293de806b0bcc148  PHP_CompatInfo-2.14.0.tgz
+b8202cff7a77058754f3cb09e3dd0ce7  PHP_CompatInfo-2.14.1.tgz


More information about the scm-commits mailing list