[arch-commits] Commit in words/trunk (PKGBUILD)

[Kyle Keen]

    Date: Friday, December 11, 2015 @ 22:49:25
  Author: kkeen
Revision: 153062

upgpkg: words 2.1-4  FS#47262

Modified:
  words/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-11 19:55:55 UTC (rev 153061)
+++ PKGBUILD	2015-12-11 21:49:25 UTC (rev 153062)
@@ -4,7 +4,7 @@
 # Contributor: Eric Johnson <eric at coding-zone.com>
 pkgname=words
 pkgver=2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of International 'words' files for /usr/share/dict."
 arch=('any')
 url="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html"
@@ -33,11 +33,11 @@
     mkdir -p "$srcdir/$pkgname"
     cd "$srcdir/$pkgname"
 
-    find "$srcdir" -name '*.cwl' -exec cp '{}' './' \;
+    find "$srcdir" -name '*.cwl' -not -path "$srcdir/$pkgname/*" -exec cp -u '{}' './' \;
     preunzip *.cwl
     for wl in *.wl; do
         iconv --from-code=ISO-8859-1 --to-code=UTF-8 $wl | \
-        cut -d '/' -f 1 > $wl.utf8
+        cut -d '/' -f 1 | LC_ALL=C sort -df > $wl.utf8
     done
     rm *.wl
 
@@ -48,10 +48,11 @@
     done <<< "$(find "$srcdir" -name 'Copyright')"
     chmod 644 copy/*
 
-    # locale specific sort?
-    cat en-common.wl.utf8 en_US* | sort -u > us-merged
-    cat en-common.wl.utf8 en_GB* | sort -u > gb-merged
-    cat de-only.wl.utf8   de_*   | sort -u > de-merged
+    # locale specific sort for other languages?
+    # sort specified from FS#47262
+    cat en-common.wl.utf8 en_US* | sort -u | LC_ALL=C sort -df > us-merged
+    cat en-common.wl.utf8 en_GB* | sort -u | LC_ALL=C sort -df > gb-merged
+    cat de-only.wl.utf8   de_*   | sort -u | LC_ALL=C sort -df > de-merged
 }
 
 package() {