php-horde-horde: 5.0.3

2 files changed, 26 insertions, 210 deletions

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 <wlestes@uncg.edu>
-
-#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 <arekm@pld-linux.org>
-#   * merge PLD changes, kde, all-name (mkochano,pascalek@PLD)
-# 1999-10-19 Artur Frysiak <wiget@pld-linux.org>
-#   * added support for GNOME help files
-#   * start support for KDE help files
-
-usage () {
-cat <<EOF
-
-Usage: $0 TOP_DIR PACKAGE_NAME [prefix]
-
-where TOP_DIR is
-the top of the tree containing the files to be processed--should be
-\$RPM_BUILD_ROOT usually. TOP_DIR gets sed'd out of the output list.
-PACKAGE_NAME is the %{name} of the package. This should also be
-the basename of the .mo files.  the output is written to
-PACKAGE_NAME.lang unless \$3 is given in which case output is written
-to \$3.
-Additional options:
-  --with-gnome		find GNOME help files
-  --with-kde		find KDE help files
-  --with-qt		find Qt translation files
-  --with-man		find localized man pages
-  --all-name		match all package/domain names
-  --without-mo		do not find locale files
-EOF
-exit 1
-}
-
-if [ -z "$1" ] ; then usage
-elif [ $1 = / ] ; then echo $0: expects non-/ argument for '$1' 1>&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.spec b/php-horde-horde.spec
index bddb9bb..0b43e03 100644
--- a/php-horde-horde.spec
+++ b/php-horde-horde.spec
@@ -12,15 +12,13 @@
 
 Name:           php-horde-horde
 Version:        5.0.3
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Horde Application Framework
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.horde.org/apps/horde
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-# /usr/lib/rpm/find-lang.sh from fedora 16
-Source1:        find-lang.sh
 Source2:        horde.conf
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -94,8 +92,19 @@ Requires:       php-pear(%{pear_channel}/Horde_View) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_View) >= 3.0.0
 Requires:       php-pear(%{pear_channel}/Horde_Vfs) >= 2.0.0
 Conflicts:      php-pear(%{pear_channel}/Horde_Vfs) >= 3.0.0
-# Optionnal: Net_DNS2, Services_Weather, Horde_ActiveSync, Horde_Db, Horde_Feed, Horde_Oauth, Horde_Service_Facebook,
-#            Horde_Service_Twitter, Horde_Service_Weather, Horde_SyncMl, Console_Getopt, Console_Table, File_Find
+# Optionnal
+Requires:       php-pear(File_Find)
+Requires:       php-pear(File_Fstab)
+Requires:       php-pear(Console_Getopt)
+Requires:       php-pear(Console_Table)
+Requires:       php-pear(Net_DNS2)
+Requires:       php-pear(Services_Weather)
+Requires:       php-pear(Services_Weather)
+Requires:       php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
+Requires:       php-pear(%{pear_channel}/Horde_SyncMl) >= 2.0.0
+
+# Optionnal: Horde_ActiveSync, Horde_Feed, Horde_Oauth, Horde_Service_Facebook,
+#            Horde_Service_Twitter, Horde_Service_Weather
 
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 
@@ -153,16 +162,13 @@ cp %{buildroot}%{_sysconfdir}/horde/conf.php.dist \
 
 install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
-%if 0%{?fedora} > 13
-%find_lang %{pear_name}
-%else
-sh %{SOURCE1} %{buildroot} %{pear_name}
-%endif
-for xml in locale/*/help.xml
+# Locales
+for loc in locale/{??,??_??}
 do
-    lang=$(basename $(dirname $xml))
-    echo "%%lang(${lang%_*}) %{pear_hordedir}/$xml" >> %{pear_name}.lang
-done
+    lang=$(basename $loc)
+    test -d %{buildroot}%{pear_hordedir}/$loc \
+         && echo "%%lang(${lang%_*}) %{pear_hordedir}/$loc"
+done | tee ../%{pear_name}.lang
 
 
 %clean
@@ -180,7 +186,7 @@ if [ $1 -eq 0 ] ; then
 fi
 
 
-%files -f %{pear_name}-%{version}/%{pear_name}.lang
+%files -f %{pear_name}.lang
 %defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
@@ -208,10 +214,7 @@ fi
 %{pear_hordedir}/config
 %{pear_hordedir}/install
 %{pear_hordedir}/lib
-# own locales (non standard) directories, .mo own by find_lang
 %dir %{pear_hordedir}/locale
-%dir %{pear_hordedir}/locale/*
-%dir %{pear_hordedir}/locale/*/LC_MESSAGES
 %{pear_hordedir}/rpc
 %{pear_hordedir}/services
 %{pear_hordedir}/static
@@ -224,6 +227,11 @@ fi
 
 
 %changelog
+* Thu Jan 10 2013 Remi Collet <RPMS@FamilleCollet.com> - 5.0.3-1
+- Update to 5.0.3 for remi repo
+- use local script instead of find_lang
+- add more optional requires
+
 * Mon Nov 19 2012 Remi Collet <RPMS@FamilleCollet.com> - 5.0.2-2
 - fix apache config and rename to php-horde-horde.conf