commit cd372c8719875c8b14492086675bbbb6304f37be
Author: Elan Ruusamäe <[email protected]>
Date: Sat Nov 11 15:14:44 2017 +0200
lang: fix packaging locale dirs
find-lang.sh | 6 ++++--
gitlab-ce.spec | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index ddcf1c4..5f32d70 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -198,6 +198,7 @@ sh -x %{SOURCE12} $RPM_BUILD_ROOT%{appdir}
# rpm cruft from repackaging
rm -f $RPM_BUILD_ROOT%{appdir}/debug*.list
+rm -f $RPM_BUILD_ROOT%{appdir}/%{name}.lang
# Creating links
mv $RPM_BUILD_ROOT%{appdir}/tmp/sockets/*
$RPM_BUILD_ROOT%{_localstatedir}/run/gitlab
diff --git a/find-lang.sh b/find-lang.sh
index 824d1d3..8d806bb 100755
--- a/find-lang.sh
+++ b/find-lang.sh
@@ -22,8 +22,10 @@ while read file; do
rc=1
;;
esac
- echo "%lang($lang) ${file#$RPM_BUILD_ROOT}" >> $langfile
-done < $tmp
+ dir=${file%/*}
+ echo "%lang($lang) %dir ${dir#$RPM_BUILD_ROOT}"
+ echo "%lang($lang) ${file#$RPM_BUILD_ROOT}"
+done < $tmp >> $langfile
if [ "$(grep -Ev '(^%defattr|^$)' $langfile | wc -l)" -le 0 ]; then
echo >&2 "$PROG: Error: international files not found!"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/c4fb95eb8b3c5bf51c349d62f48521ccaff20788
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
