[php-pear-Cache-Lite/el6] update to 1.7.12

Remi Collet remi at fedoraproject.org
Tue Aug 16 07:04:27 UTC 2011


commit 644710e557cc235ce04607c2d8f5ad029c8364db
Author: remi <fedora at famillecollet.com>
Date:   Tue Aug 16 09:04:12 2011 +0200

    update to 1.7.12

 .gitignore               |    6 ++++--
 php-pear-Cache-Lite.spec |   27 ++++++++++++---------------
 sources                  |    2 +-
 xml2changelog            |    6 +++---
 4 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 833f57d..d3a1ddf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*~
 package-*.xml
-Cache_Lite-1.7.8.tgz
-/Cache_Lite-1.7.9.tgz
+/Cache_Lite-1.7.10.tgz
+/Cache_Lite-1.7.11.tgz
+/Cache_Lite-1.7.12.tgz
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index fbdeff5..17c71ac 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -4,7 +4,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.7.9
+Version:        1.7.12
 Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
@@ -37,10 +37,6 @@ et/ou des tests anti-corruption).
 %setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
 cd %{pear_name}-%{version}
 # package.xml is V2
 mv ../package.xml %{name}.xml
@@ -51,10 +47,10 @@ mv ../package.xml %{name}.xml
 
 
 %install
-rm -rf %{buildroot} docdir
+rm -rf %{buildroot}
 
-pushd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+cd %{pear_name}-%{version}
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -63,11 +59,6 @@ rm -rf %{buildroot}%{pear_phpdir}/.??*
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
 %{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
-popd
-# Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/%{pear_name}/* docdir
-
 
 %clean
 rm -rf %{buildroot}
@@ -78,7 +69,7 @@ lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} \
+%{__pear} \
    run-tests \
    -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
    tests | tee ../tests.log
@@ -97,13 +88,19 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/Cache
 %{pear_testdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Tue Aug 16 2011 Remi Collet <Fedora at FamilleCollet.com> 1.7.12-1
+- Version 1.7.12 (stable) - API 1.7.7 (stable)
+- Updated LICENSE file
+- doc in /usr/share/doc/pear
+
 * Wed Mar 02 2011 Remi Collet <Fedora at FamilleCollet.com> 1.7.9-1
 - Version 1.7.9 (stable) - API 1.7.7 (stable)
 - define timezone during build
diff --git a/sources b/sources
index 6952c72..72a0ac5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4b84a2016f995a193749d00028f0669  Cache_Lite-1.7.9.tgz
+2821420ba814c66fa37b47afd75b9821  Cache_Lite-1.7.12.tgz
diff --git a/xml2changelog b/xml2changelog
index c04c442..4c789f4 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -27,10 +27,10 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
 		krsort($tab);
 		foreach($tab as $rel) {
 			printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
-				$rel->version->release, $rel->stability->release, 
-				$rel->version->api, $rel->stability->api, 
+				$rel->version->release, $rel->stability->release,
+				$rel->version->api, $rel->stability->api,
 				$rel->date, $rel->notes);
-	    	}
+		}
 	}
 } else { // Package.xml V 1.0
 	printf("* Version %s (%s) - %s\n\n%s\n\n",


More information about the scm-commits mailing list