diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | find-lang.pl | 9 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,6 @@ +Version 1.144 - 19 Sep 2011, by Funda Wang +- Add support for fdo /usr/share/help when find_lang + Version 1.143 - 11 Sept 2011, by Derek Morgan - Add automatic rm -fr %buildroot in %install - Add systemd rpm macro diff --git a/configure.ac b/configure.ac index bb74c30..71ec84b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $ AC_PREREQ(2.59) -AC_INIT(rpm-mageia-setup, 1.142, jquelin@mageia.org) +AC_INIT(rpm-mageia-setup, 1.144, jquelin@mageia.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz) AC_CONFIG_SRCDIR diff --git a/find-lang.pl b/find-lang.pl index 66f507c..f14f2e0 100755 --- a/find-lang.pl +++ b/find-lang.pl @@ -11,6 +11,7 @@ use Pod::Usage; GetOptions( 'all-name' => \my $allname, 'with-gnome' => \my $withgnome, + 'with-help' => \my $withhelp, 'with-kde' => \my $withkde, 'with-html' => \my $withhtml, 'without-mo' => \my $withoutmo, @@ -53,6 +54,14 @@ File::Find::find( if (pkg_match($pkg)) { parent_to_own($langfile, $file, $lang); } + } elsif ($file =~ m:^((.*/share/help)/([^/]+)/([^/]+))/([^/]+).*:) { + if (!$withhelp) { + return; + } + my ($pkg, $lang, $parent, $langfile) = ($4, $3, $2, $1); + if (pkg_match($pkg)) { + parent_to_own($langfile, $file, $lang); + } } elsif ($file =~ m:^((.*/doc/kde)/HTML/([^/@]+)[^/]*)/([^/]+)/.*:) { if (!$withkde) { return; |