[php-horde-Horde-Smtp] update to 1.4.1
Remi Collet
remi at fedoraproject.org
Sat Apr 5 09:34:00 UTC 2014
commit 67292d30f6516ec27d95d33520f25f02fecf5de2
Author: Remi Collet <remi at fedoraproject.org>
Date: Sat Apr 5 11:33:45 2014 +0200
update to 1.4.1
.gitignore | 1 +
php-horde-Horde-Smtp.spec | 33 ++++++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 382edfa..ff796c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/Horde_Smtp-1.3.1.tgz
/Horde_Smtp-1.4.0.tgz
+/Horde_Smtp-1.4.1.tgz
diff --git a/php-horde-Horde-Smtp.spec b/php-horde-Horde-Smtp.spec
index 3631035..83b904e 100644
--- a/php-horde-Horde-Smtp.spec
+++ b/php-horde-Horde-Smtp.spec
@@ -12,7 +12,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Smtp
-Version: 1.4.0
+Version: 1.4.1
Release: 1%{?dist}
Summary: Horde SMTP Client
@@ -22,6 +22,7 @@ URL: http://%{pear_channel}
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
BuildArch: noarch
+BuildRequires: gettext
BuildRequires: php(language) >= 5.3.0
BuildRequires: php-pear(PEAR) >= 1.7.0
BuildRequires: php-channel(%{pear_channel})
@@ -66,15 +67,20 @@ e-mail messages..
cd %{pear_name}-%{version}
# Don't install .po and .pot files
-sed -e '/%{pear_name}.pot/d' \
+# Remove checksum for .mo, as we regenerate them
+sed -e '/%{pear_name}.po/d' \
+ -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
-# No .mo file for now, so no gettext required
-
%build
cd %{pear_name}-%{version}
-# Empty build section, most likely nothing required.
+
+# Regenerate the locales
+for po in $(find locale -name \*.po)
+do
+ msgfmt $po -o $(dirname $po)/$(basename $po .po).mo
+done
%install
@@ -88,13 +94,20 @@ rm -rf %{buildroot}%{pear_metadir}/.??*
mkdir -p %{buildroot}%{pear_xmldir}
install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+for loc in locale/{??,??_??}
+do
+ lang=$(basename $loc)
+ test -d %{buildroot}%{pear_datadir}/%{pear_name}/$loc \
+ && echo "%%lang(${lang%_*}) %{pear_datadir}/%{pear_name}/$loc"
+done | tee ../%{pear_name}.lang
+
%check
# All tests skipped for now (need a SMTP server configured)
src=$(pwd)/%{pear_name}-%{version}
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
phpunit \
- -d include_path=$src/lib:.:%{pear_phpdir} \
+ --include-path=$src/lib \
-d date.timezone=UTC \
.
@@ -110,15 +123,21 @@ if [ $1 -eq 0 ] ; then
fi
-%files
+%files -f %{pear_name}.lang
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Smtp
%{pear_phpdir}/Horde/Smtp.php
%{pear_testdir}/%{pear_name}
+%dir %{pear_datadir}/%{pear_name}
+%dir %{pear_datadir}/%{pear_name}/locale
%changelog
+* Fri Apr 04 2014 Remi Collet <remi at fedoraproject.org> - 1.4.1-1
+- Update to 1.4.1
+- add gettext for provided locales
+
* Tue Feb 11 2014 Remi Collet <remi at fedoraproject.org> - 1.4.0-1
- Update to 1.4.0
- Add dependency on Horde_Translation
diff --git a/sources b/sources
index 6f5ec35..b246ef9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-436f9620edaeec4d67610bd91b1025d8 Horde_Smtp-1.4.0.tgz
+701c194d5a95caf6ef13af481dc8d02e Horde_Smtp-1.4.1.tgz
More information about the scm-commits
mailing list