RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 01-Jun-2012 15:32:26
Branch: rpm-5_4 Handle: 2012060113322501
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/scripts find-lang.sh
Log:
added find-lang support for the MATE desktop help files (GNOME2 fork)
Summary:
Revision Changes Path
1.3501.2.300+1 -0 rpm/CHANGES
1.10.8.7 +34 -0 rpm/scripts/find-lang.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.299 -r1.3501.2.300 CHANGES
--- rpm/CHANGES 29 May 2012 17:42:28 -0000 1.3501.2.299
+++ rpm/CHANGES 1 Jun 2012 13:32:25 -0000 1.3501.2.300
@@ -1,4 +1,5 @@
5.4.9 -> 5.4.10:
+ - mdawkins: added find-lang support for the MATE desktop help files
(GNOME2 fork)
- rpmevr: RPMEVR_T parsing for twiddle-in-version mischief in rpm-4.10.0.
- devzero2000: Add support for 7zip compressed tarballs
patch by Christophe Fergeau
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/find-lang.sh
============================================================================
$ cvs diff -u -r1.10.8.6 -r1.10.8.7 find-lang.sh
--- rpm/scripts/find-lang.sh 19 May 2012 17:34:32 -0000 1.10.8.6
+++ rpm/scripts/find-lang.sh 1 Jun 2012 13:32:26 -0000 1.10.8.7
@@ -34,6 +34,7 @@
to \$3.
Additional options:
--with-gnome find GNOME help files
+ --with-mate find MATE help files
--with-kde find KDE help files
--with-qt find Qt translation files
--with-html find HTML files
@@ -59,6 +60,7 @@
shift
GNOME=#
+MATE=#
KDE=#
QT=#
MAN=#
@@ -73,6 +75,10 @@
GNOME=
shift
;;
+ --with-mate )
+ MATE=
+ shift
+ ;;
--with-kde )
KDE=
shift
@@ -158,6 +164,34 @@
s:%lang(C) ::
/^$/d' >> $MO_NAME
+find $TOP_DIR -type d|sed '
+s:'"$TOP_DIR"'::
+'"$NO_ALL_NAME$MATE"'s:\(.*/mate/help/'"$NAME"'$\):%dir \1:
+'"$NO_ALL_NAME$MATE"'s:\(.*/mate/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
+'"$NO_ALL_NAME$MATE"'s:\(.*/mate/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2)
\1\2:
+'"$ALL_NAME$MATE"'s:\(.*/mate/help/[a-zA-Z0-9.\_\-]\+$\):%dir \1:
+'"$ALL_NAME$MATE"'s:\(.*/mate/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+\)::
+'"$ALL_NAME$GNOME"'s:\(.*/mate/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2)
\1\2:
+s:%lang(.*) .*/mate/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$MATE"'s:\(.*/omf/'"$NAME"'$\):%dir \1:
+'"$ALL_NAME$MATE"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+$\):%dir \1:
+s:^\([^%].*\)::
+/^$/d' >> $MO_NAME
+
+find "$TOP_DIR" -type f|sed '
+s:'"$TOP_DIR"'::
+'"$NO_ALL_NAME$MATE"'s:\(.*/omf/'"$NAME"'/'"$NAME"'-\([^/.]\+\)\.omf\):%lang(\2)
\1:
+'"$ALL_NAME$MATE"'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 '
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
