[php-horde-Horde-Cli] update to 2.0.3

Remi Collet remi at fedoraproject.org
Wed Jan 30 06:32:54 UTC 2013


commit 62032d7e28246d9e8418cabaaa1c8a0ad6806745
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Jan 30 07:32:47 2013 +0100

    update to 2.0.3

 .gitignore               |    1 +
 php-horde-Horde-Cli.spec |   38 ++++++++++++++++++--------------------
 sources                  |    2 +-
 3 files changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a153c62..7d32f3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /Horde_Cli-1.0.4.tgz
 /Horde_Cli-2.0.1.tgz
 /Horde_Cli-2.0.2.tgz
+/Horde_Cli-2.0.3.tgz
diff --git a/php-horde-Horde-Cli.spec b/php-horde-Horde-Cli.spec
index df1b6e0..dd5499d 100644
--- a/php-horde-Horde-Cli.spec
+++ b/php-horde-Horde-Cli.spec
@@ -1,32 +1,33 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%global pear_name Horde_Cli
+%global pear_name    Horde_Cli
+%global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Cli
-Version:        2.0.2
+Version:        2.0.3
 Release:        1%{?dist}
 Summary:        Horde Command Line Interface API
 
 Group:          Development/Libraries
 License:        LGPLv2+
-URL:            http://pear.horde.org
-Source0:        http://pear.horde.org/get/%{pear_name}-%{version}.tgz
+URL:            http://%{pear_channel}
+Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.7.0
-BuildRequires:  php-channel(pear.horde.org)
+BuildRequires:  php-channel(%{pear_channel})
 BuildRequires:  gettext
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
-Requires:       php-pear(pear.horde.org/Horde_Support) >= 2.0.0
-Requires:       php-pear(pear.horde.org/Horde_Translation) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0
 Requires:       php-pear(PEAR) >= 1.7.0
-Requires:       php-channel(pear.horde.org)
+Requires:       php-channel(%{pear_channel})
 Requires:       php-pcre php-session
 Requires:       php-common >= 5.3.0
 
-Provides:       php-pear(pear.horde.org/%{pear_name}) = %{version}
+Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
 %description
 Horde_Cli:: API for basic command-line functionality/checks
@@ -34,10 +35,6 @@ Horde_Cli:: API for basic command-line functionality/checks
 %prep
 %setup -q -c
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
 cd %{pear_name}-%{version}
 
 # Don't install .po and .pot files
@@ -57,7 +54,7 @@ done
 
 %install
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_metadir}/.??*
@@ -80,7 +77,7 @@ done | tee ../%{pear_name}.lang
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        pear.horde.org/%{pear_name} >/dev/null || :
+        %{pear_channel}/%{pear_name} >/dev/null || :
 fi
 
 %files -f %{pear_name}.lang
@@ -88,13 +85,14 @@ fi
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Cli
 %{pear_phpdir}/Horde/Cli.php
-# own locales (non standard) directories, .mo own by find_lang
-%dir %{pear_datadir}/Horde_Cli
-%dir %{pear_datadir}/Horde_Cli/locale
-%dir %{pear_datadir}/Horde_Cli/locale/*
-%dir %{pear_datadir}/Horde_Cli/locale/*/LC_MESSAGES
+%dir %{pear_datadir}/%{pear_name}
+%dir %{pear_datadir}/%{pear_name}/locale
 
 %changelog
+* Wed Jan 30 2013 Remi Collet <remi at fedoraproject.org> - 2.0.3-1
+- Update to 2.0.3
+- fix files listed twice
+
 * Fri Jan 11 2013 Nick Bebout <nb at fedoraproject.org> - 2.0.2-1
 - Update to 2.0.2
 
diff --git a/sources b/sources
index 3b73e64..a1ae102 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3ff523746cd083f414f4817aebf6256  Horde_Cli-2.0.2.tgz
+4102045c14220f3d3390090f848e279b  Horde_Cli-2.0.3.tgz


More information about the scm-commits mailing list