From f8de75b2b62b46a263ba899e00b7e1b794ffd452 Mon Sep 17 00:00:00 2001
From: eaglegai <eaglegai@163.com>
Date: Fri, 4 Sep 2020 15:15:29 +0800
Subject: [PATCH] fix build error because of gettext's updating

---
 ...llback-ITS-rule-warning-from-gettext.patch | 28 +++++++++++++++++++
 blivet-gui.spec                               | 12 ++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 0001-Ignore-fallback-ITS-rule-warning-from-gettext.patch

diff --git a/0001-Ignore-fallback-ITS-rule-warning-from-gettext.patch b/0001-Ignore-fallback-ITS-rule-warning-from-gettext.patch
new file mode 100644
index 0000000..e1f42e4
--- /dev/null
+++ b/0001-Ignore-fallback-ITS-rule-warning-from-gettext.patch
@@ -0,0 +1,28 @@
+From 0aae60b135c0f15cbbdb8b196cb3a43e1308d840 Mon Sep 17 00:00:00 2001
+From: Vojtech Trefny <vtrefny@redhat.com>
+Date: Sat, 8 Aug 2020 21:42:20 +0200
+Subject: [PATCH] Ignore fallback ITS rule warning from gettext
+
+New gettext 0.21 started warning about this and translation canary
+treats all warning as errors. But this one is really just a warning
+we don't care about.
+---
+ translation-canary/xgettext_werror.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/translation-canary/xgettext_werror.sh b/translation-canary/xgettext_werror.sh
+index 36eefec..5fb32a8 100755
+--- a/translation-canary/xgettext_werror.sh
++++ b/translation-canary/xgettext_werror.sh
+@@ -37,7 +37,7 @@ returncode=0
+ xgettext_output="$(LC_MESSAGES=C xgettext "$@" 2>&1)" || returncode=$?
+ 
+ # Look for warnings
+-if echo "$xgettext_output" | fgrep -q "warning: "; then
++if echo "$xgettext_output" | awk '/warning: / && !/fallback ITS rule/{rc=1}; END {exit !rc}'; then
+     returncode=1
+ fi
+ 
+-- 
+1.8.3.1
+
diff --git a/blivet-gui.spec b/blivet-gui.spec
index 508ea54..cbc3fcb 100644
--- a/blivet-gui.spec
+++ b/blivet-gui.spec
@@ -1,11 +1,13 @@
 Name:            blivet-gui
 Version:         2.1.15
-Release:         1
+Release:         2
 Summary:         Tool for data storage configuration
 License:         GPLv2+
 URL:             https://github.com/storaged-project/blivet-gui
 Source0:         https://github.com/storaged-project/blivet-gui/releases/download/%{version}/%{name}-%{version}.tar.gz
 
+Patch0:          0001-Ignore-fallback-ITS-rule-warning-from-gettext.patch
+
 BuildArch:       noarch
 BuildRequires:   desktop-file-utils libappstream-glib python3-devel gettext python3-setuptools
 
@@ -22,7 +24,7 @@ Graphical (GTK) tool for manipulation and configuration of data storage
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 %make_build
@@ -54,6 +56,12 @@ install -d %{buildroot}/%{_localstatedir}/log/blivet-gui
 %{_mandir}/man1/blivet-gui.1*
 
 %changelog
+* Fri Sep 4 2020 gaihuiying<gaihuiying1@huawei.com> - 2.1.15-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix build error because gettext update to 0.21
+
 * Wed Jul 22 2020 gaihuiying <gaihuiying1@huawei.com> - 2.11.15-1
 - Type:requirement
 - ID:NA
-- 
Gitee