From b337b7d4a34230d21c3858924dc0cfe7b36d409e Mon Sep 17 00:00:00 2001 From: remi Date: Mon, 30 May 2011 19:30:22 +0200 Subject: [PATCH 1/4] update to 1.7.10 --- .gitignore | 4 ++-- php-pear-Cache-Lite.spec | 20 +++++++++++--------- sources | 2 +- xml2changelog | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 833f57d..dafc289 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ +*~ package-*.xml -Cache_Lite-1.7.8.tgz -/Cache_Lite-1.7.9.tgz +/Cache_Lite-1.7.10.tgz diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec index 8fe53ce..d4eadc7 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.10 Release: 1%{?dist} License: PHP Group: Development/Libraries @@ -51,9 +51,9 @@ mv ../package.xml %{name}.xml %install -rm -rf %{buildroot} docdir +rm -rf %{buildroot} -pushd %{pear_name}-%{version} +cd %{pear_name}-%{version} PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files @@ -63,11 +63,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} @@ -97,13 +92,20 @@ 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 +* Mon May 30 2011 Remi Collet 1.7.10-1 +- Version 1.7.10 (stable) - API 1.7.7 (stable) +- TOFIX: LICENSE file provided is outdated + http://pear.php.net/bugs/18571 +- doc in /usr/share/doc/pear + * Wed Mar 02 2011 Remi Collet 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..75708d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4b84a2016f995a193749d00028f0669 Cache_Lite-1.7.9.tgz +b4737e538b115dceb38f6e1d8ea46a1a Cache_Lite-1.7.10.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", From ea2c5b8a23954bce744228fb9490769980b1eee1 Mon Sep 17 00:00:00 2001 From: remi Date: Tue, 31 May 2011 17:39:18 +0200 Subject: [PATCH 2/4] update to 1.7.11 (docfix) --- .gitignore | 1 + php-pear-Cache-Lite.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dafc289..fa52e48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *~ package-*.xml /Cache_Lite-1.7.10.tgz +/Cache_Lite-1.7.11.tgz diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec index d4eadc7..b4df490 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.10 +Version: 1.7.11 Release: 1%{?dist} License: PHP Group: Development/Libraries @@ -100,6 +100,10 @@ fi %changelog +* Mon May 31 2011 Remi Collet 1.7.11-1 +- Version 1.7.11 (stable) - API 1.7.7 (stable) +- Updated LICENSE file + * Mon May 30 2011 Remi Collet 1.7.10-1 - Version 1.7.10 (stable) - API 1.7.7 (stable) - TOFIX: LICENSE file provided is outdated diff --git a/sources b/sources index 75708d5..3c577b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b4737e538b115dceb38f6e1d8ea46a1a Cache_Lite-1.7.10.tgz +e4f5488d6abded38baf04bc0a4aa3e7e Cache_Lite-1.7.11.tgz From 48a161c7adcea910fa837cbdafb3df8596eb6a44 Mon Sep 17 00:00:00 2001 From: remi Date: Tue, 31 May 2011 17:40:20 +0200 Subject: [PATCH 3/4] fix date in changelog --- php-pear-Cache-Lite.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec index b4df490..92bff23 100644 --- a/php-pear-Cache-Lite.spec +++ b/php-pear-Cache-Lite.spec @@ -100,7 +100,7 @@ fi %changelog -* Mon May 31 2011 Remi Collet 1.7.11-1 +* Tue May 31 2011 Remi Collet 1.7.11-1 - Version 1.7.11 (stable) - API 1.7.7 (stable) - Updated LICENSE file From 410b414dec0e967632d131b709bc58229c916889 Mon Sep 17 00:00:00 2001 From: remi Date: Tue, 16 Aug 2011 09:11:29 +0200 Subject: [PATCH 4/4] update to 1.7.12 --- .gitignore | 1 + php-pear-Cache-Lite.spec | 13 ++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index fa52e48..d3a1ddf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ package-*.xml /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 92bff23..f2cae27 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.11 +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 @@ -54,7 +50,7 @@ mv ../package.xml %{name}.xml rm -rf %{buildroot} cd %{pear_name}-%{version} -PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml +%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files rm -rf %{buildroot}%{pear_phpdir}/.??* @@ -73,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 @@ -100,6 +96,9 @@ fi %changelog +* Tue Aug 16 2011 Remi Collet 1.7.12-1 +- Version 1.7.12 (stable) - API 1.7.7 (stable) + * Tue May 31 2011 Remi Collet 1.7.11-1 - Version 1.7.11 (stable) - API 1.7.7 (stable) - Updated LICENSE file diff --git a/sources b/sources index 3c577b5..72a0ac5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4f5488d6abded38baf04bc0a4aa3e7e Cache_Lite-1.7.11.tgz +2821420ba814c66fa37b47afd75b9821 Cache_Lite-1.7.12.tgz