From 631d4295cbaf1e48ebd2c06fa68f9068cbc9ad80 Mon Sep 17 00:00:00 2001 From: Luc Menut Date: Thu, 4 Apr 2013 06:56:38 +0000 Subject: revert svn 7582 b/c it introduces a regression when --with-man is used in combination with another --with-xxxx: all the directories found by find-lang are skipped --- NEWS | 5 +++++ configure.ac | 2 +- find-lang.pl | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 05f17d0..d110572 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +Version 1.170 - 4 April 2013, by Luc Menut +- revert change 1.168 because it introduces a regression when --with-man + is used in combination with another --with-xxxx: all the directories + found by find-lang are skipped (not only man directories mga #3697c10) + Version 1.169 - 24 March 2013, by Colin Guthrie - add version macros for systemd/rpm-helper to ease distro upgrades diff --git a/configure.ac b/configure.ac index b35b66b..b40b637 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.169, rtp@mageia.org) +AC_INIT(rpm-mageia-setup, 1.170, rtp@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 bb70618..3b622da 100755 --- a/find-lang.pl +++ b/find-lang.pl @@ -73,7 +73,6 @@ open(my $hlang, '>', "$pkgname.lang") or die "cannot open $pkgname.lang\n"; foreach my $f (sort keys %finallist) { my ($lang, @otherlang) = keys %{ $finallist{$f}{lang} || {} }; - next if $withman && !$allname && $finallist{$f}{dir}; my $l = sprintf("%s%s%s", $finallist{$f}{dir} ? '%dir ' : '', @otherlang == 0 && $lang && $lang ne 'C' -- cgit v1.2.1