]> git.pld-linux.org Git - packages/rpm-build-macros.git/commitdiff
find-lang: use find.dirs after it has been created auto/th/rpm-build-macros-1.723-4
authorElan Ruusamäe <glen@delfi.ee>
Sun, 23 Apr 2017 22:38:45 +0000 (01:38 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Sun, 23 Apr 2017 22:38:45 +0000 (01:38 +0300)
find-lang.sh
rpm-build-macros.spec

index 7befc80566e98b94a11b23d675ad83fd884ec436..c58441b8d788cc3a543db90bde53017603dceaa4 100755 (executable)
@@ -203,12 +203,6 @@ fi
 /^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 
-# Django
-cat __find.dirs | sed -r -e '
-'"$DJANGO"'s:(.+/share/python.+/locale/)([^/@]+)(@quot|@boldquot)?(@[^/]*)?$:%lang(\2\4) \1\2\3\4:
-/^[^%]/d
-s:%lang(C) ::' >> $MO_NAME
-
 # .omf
 (
        if [ "$ALL_NAME" ]; then
@@ -293,6 +287,7 @@ s:%lang(C) ::' >> $MO_NAME
 /^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 
+# OMF
 (
        if [ "$ALL_NAME" ]; then
                grep -F $NAME __find.dirs
@@ -305,6 +300,12 @@ s:%lang(C) ::' >> $MO_NAME
 /^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 
+# Django
+cat __find.dirs | sed -r -e '
+'"$DJANGO"'s:(.+/share/python.+/locale/)([^/@]+)(@quot|@boldquot)?(@[^/]*)?$:%lang(\2\4) \1\2\3\4:
+/^[^%]/d
+s:%lang(C) ::' >> $MO_NAME
+
 if [ "$(grep -Ev '(^%defattr|^$)' $MO_NAME | wc -l)" -le 0 ]; then
        echo >&2 "$PROG: Error: international files not found for '$NAME'!"
        exit 1
index 0de05c170a1bf01783b3f1ca68e0437ad7d4fd61..e1635c4331874adbe12c611eec35cc6d4423621f 100644 (file)
@@ -4,7 +4,7 @@ Summary:        PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros
 Version:       %{rpm_macros_rev}
-Release:       3
+Release:       4
 License:       GPL
 Group:         Development/Building
 Source0:       rpm.macros
This page took 0.082367 seconds and 4 git commands to generate.