[php-pear-Console-Color/el6/master] import 1.0.3

Remi Collet remi at fedoraproject.org
Sun Oct 31 06:23:45 UTC 2010


commit 5d5f2d3b2867cccb5c5fe4a160288b38c417793c
Author: remi <fedora at famillecollet.com>
Date:   Sun Oct 31 07:23:45 2010 +0100

    import 1.0.3

 .gitignore                  |    2 ++
 php-pear-Console-Color.spec |   38 +++++++++++++++++++++++---------------
 sources                     |    2 +-
 3 files changed, 26 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4665f9d..fa62b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 Console_Color-1.0.2.tgz
+package*.xml
+/Console_Color-1.0.3.tgz
diff --git a/php-pear-Console-Color.spec b/php-pear-Console-Color.spec
index af497ab..bbf3817 100644
--- a/php-pear-Console-Color.spec
+++ b/php-pear-Console-Color.spec
@@ -1,9 +1,9 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Console_Color
+%global pear_name Console_Color
 
 Name:           php-pear-Console-Color
-Version:        1.0.2
-Release:        4%{?dist}
+Version:        1.0.3
+Release:        1%{?dist}
 Summary:        Easily use ANSI console colors from PHP applications
 Summary(en_GB): Easily use ANSI console colours from PHP applications
 
@@ -11,10 +11,11 @@ Group:          Development/Libraries
 License:        MIT
 URL:            http://pear.php.net/package/Console_Color
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -30,9 +31,13 @@ applications written in PHP.
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+# 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
 
 
 %build
@@ -41,13 +46,12 @@ cd %{pear_name}-%{version}
 
 
 %install
-cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/* ../docdir
 
 
 # Clean up unnecessary files
@@ -55,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -64,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -75,13 +79,17 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-
-%{pear_xmldir}/%{pear_name}.xml
+%doc docdir/*
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Console/Color.php
 
 
 %changelog
+* Sat Oct 30 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.0.3-1
+- Version 1.0.3 (stable) - API 1.0.0 (stable) - QA release
+- set timezone during build
+- rename Console_Color.xml to php-pear-Console-Color.xml
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 6a7b0ba..04ad88d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8fe454cb9d04b2bbe40bf06626217839  Console_Color-1.0.2.tgz
+af1e648be513f6496d2c33b3b441cc76  Console_Color-1.0.3.tgz


More information about the scm-commits mailing list