From c4341a594a2b7f1bf0a55ca1fed7c7e479fdff8a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Jan 2013 16:29:59 +0100 Subject: php-horde-Horde-Date: 2.0.2 --- find-lang.sh | 192 ---------------------------------------------- php-horde-Horde-Date.spec | 35 +++++---- 2 files changed, 20 insertions(+), 207 deletions(-) delete mode 100755 find-lang.sh diff --git a/find-lang.sh b/find-lang.sh deleted file mode 100755 index cfd3be9..0000000 --- a/find-lang.sh +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/sh -#findlang - automagically generate list of language specific files -#for inclusion in an rpm spec file. -#This does assume that the *.mo files are under .../locale/... -#Run with no arguments gets a usage message. - -#findlang is copyright (c) 1998 by W. L. Estes - -#Redistribution and use of this software are hereby permitted for any -#purpose as long as this notice and the above copyright notice remain -#in tact and are included with any redistribution of this file or any -#work based on this file. - -# 2004-06-20 Arkadiusz Miśkiewicz -# * merge PLD changes, kde, all-name (mkochano,pascalek@PLD) -# 1999-10-19 Artur Frysiak -# * added support for GNOME help files -# * start support for KDE help files - -usage () { -cat <&2 -elif [ ! -d $1 ] ; then - echo $0: $1: no such directory - exit 1 -else TOP_DIR="`echo $1|sed -e 's:/$::'`" -fi -shift - -if [ -z "$1" ] ; then usage -else NAME=$1 -fi -shift - -GNOME=# -KDE=# -QT=# -MAN=# -MO= -MO_NAME=$NAME.lang -ALL_NAME=# -NO_ALL_NAME= - -while test $# -gt 0 ; do - case "${1}" in - --with-gnome ) - GNOME= - shift - ;; - --with-kde ) - KDE= - shift - ;; - --with-qt ) - QT= - shift - ;; - --with-man ) - MAN= - shift - ;; - --without-mo ) - MO=# - shift - ;; - --all-name ) - ALL_NAME= - NO_ALL_NAME=# - shift - ;; - * ) - MO_NAME=${1} - shift - ;; - esac -done - -find $TOP_DIR -type f -o -type l|sed ' -s:'"$TOP_DIR"':: -'"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3: -'"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3: -s:^\([^%].*\):: -s:%lang(C) :: -/^$/d' > $MO_NAME - -find $TOP_DIR -type d|sed ' -s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1: -'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\):: -'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) \1\2: -'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%dir \1: -'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+\):: -'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2) \1\2: -s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*:: -s:^\([^%].*\):: -s:%lang(C) :: -/^$/d' >> $MO_NAME - -find $TOP_DIR -type d|sed ' -s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$GNOME"'s:\(.*/omf/'"$NAME"'$\):%dir \1: -'"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+$\):%dir \1: -s:^\([^%].*\):: -/^$/d' >> $MO_NAME - -find $TOP_DIR -type f|sed ' -s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$GNOME"'s:\(.*/omf/'"$NAME"'/'"$NAME"'-\([^/.]\+\)\.omf\):%lang(\2) \1: -'"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\)\.omf\):%lang(\2) \1: -s:^[^%].*:: -s:%lang(C) :: -/^$/d' >> $MO_NAME - -KDE3_HTML=`kde-config --expandvars --install html 2>/dev/null` -if [ x"$KDE3_HTML" != x -a -d "$TOP_DIR$KDE3_HTML" ]; then -find $TOP_DIR$KDE3_HTML -type d|sed ' -s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\):: -'"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3: -'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\):: -'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3: -s:^\([^%].*\):: -s:%lang(C) :: -/^$/d' >> $MO_NAME -fi - -KDE4_HTML=`kde4-config --expandvars --install html 2>/dev/null` -if [ x"$KDE4_HTML" != x -a -d "$TOP_DIR$KDE4_HTML" ]; then -find $TOP_DIR$KDE4_HTML -type d|sed ' -s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\):: -'"$NO_ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3: -'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\):: -'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3: -s:^\([^%].*\):: -s:%lang(C) :: -/^$/d' >> $MO_NAME -fi - -find $TOP_DIR -type f -o -type l|sed ' -s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$QT"'s:\(.*/'"$NAME"'_\([a-zA-Z]\{2\}\([_@].*\)\?\)\.qm$\):%lang(\2) \1: -'"$ALL_NAME$QT"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1: -'"$ALL_NAME$QT"'s:\(.*/[^/_]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1: -'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}[_@].*\)\.qm$\):%lang(\2) \1: -'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\{2\}\)\.qm$\):%lang(\2) \1: -s:^[^%].*:: -s:%lang(C) :: -/^$/d' >> $MO_NAME - -find $TOP_DIR -type d|sed ' -s:'"$TOP_DIR"':: -'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/\):: -'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1/*: -s:^\([^%].*\):: -s:%lang(C) :: -/^$/d' >> $MO_NAME - -find $TOP_DIR -type f -o -type l|sed ' -s:'"$TOP_DIR"':: -'"$NO_ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/'"$NAME"'\.[a-z0-9].*\):%lang(\2) \1*: -s:^\([^%].*\):: -s:%lang(C) :: -/^$/d' >> $MO_NAME - -if ! grep -q / $MO_NAME; then - echo "No translations found for ${NAME} in ${TOP_DIR}" - exit 1 -fi -exit 0 diff --git a/php-horde-Horde-Date.spec b/php-horde-Horde-Date.spec index 13e1f81..5243028 100644 --- a/php-horde-Horde-Date.spec +++ b/php-horde-Horde-Date.spec @@ -7,16 +7,14 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: php-horde-Horde-Date -Version: 2.0.1 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Horde Date package Group: Development/Libraries License: LGPLv2+ URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -# /usr/lib/rpm/find-lang.sh from fedora 16 -Source1: find-lang.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -25,7 +23,7 @@ BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) %if %{with_tests} # To run unit tests -BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.0.0 +BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 %endif Requires(post): %{__pear} @@ -88,17 +86,22 @@ rm -rf %{buildroot}%{pear_metadir}/.??* mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} -%if 0%{?fedora} > 13 -%find_lang %{pear_name} -%else -sh %{SOURCE1} %{buildroot} %{pear_name} -%endif +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 %if %{with_tests} cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) -phpunit -d date.timezone=UTC AllTests.php +# See http://bugs.horde.org/ticket/11941 +phpunit\ + -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \ + -d date.timezone=UTC \ + . %else : Test disabled, missing '--with tests' option. %endif @@ -114,21 +117,23 @@ if [ $1 -eq 0 ] ; then %{pear_channel}/%{pear_name} >/dev/null || : fi -%files -f %{pear_name}-%{version}/%{pear_name}.lang +%files -f %{pear_name}.lang %defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Horde/Date %{pear_phpdir}/Horde/Date.php %{pear_testdir}/%{pear_name} -# own locales (non standard) directories, .mo own by find_lang %dir %{pear_datadir}/%{pear_name} %dir %{pear_datadir}/%{pear_name}/locale -%dir %{pear_datadir}/%{pear_name}/locale/* -%dir %{pear_datadir}/%{pear_name}/locale/*/LC_MESSAGES %changelog +* Wed Jan 9 2013 Remi Collet - 2.0.2-1 +- Update to 2.0.2 for remi repo +- use local script instead of find_lang +- new test layout (requires Horde_Test 2.1.0) + * Wed Nov 7 2012 Remi Collet - 2.0.1-1 - Update to 2.0.1 for remi repo -- cgit