From 32b654c73331e7effeedd887ceeaec27fce73f9b Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 22 May 2018 16:27:24 -0400 Subject: [PATCH] Include the _sortCommand to the _setCommand method (vponcova, #1578930) Remove call to xgettext_werror.sh during build --- pykickstart-translation-canary.patch | 13 +++++++++++++ pykickstart.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 pykickstart-translation-canary.patch diff --git a/pykickstart-translation-canary.patch b/pykickstart-translation-canary.patch new file mode 100644 index 0000000..1730ec8 --- /dev/null +++ b/pykickstart-translation-canary.patch @@ -0,0 +1,13 @@ +diff -up pykickstart-3.12/po/Makefile.orig pykickstart-3.12/po/Makefile +--- pykickstart-3.12/po/Makefile.orig 2018-02-19 11:41:09.000000000 -0500 ++++ pykickstart-3.12/po/Makefile 2018-05-22 16:15:46.650917679 -0400 +@@ -12,8 +12,7 @@ INSTALL_NLS_DIR = $(DESTDIR)/`$(PYTHON) + + # PO catalog handling + MSGMERGE = msgmerge -v +-XGETTEXT = ../translation-canary/xgettext_werror.sh --default-domain=$(NLSPACKAGE) \ +- --add-comments ++XGETTEXT = xgettext --default-domain=$(NLSPACKAGE) --add-comments + MSGFMT = msgfmt --statistics --verbose + + # What do we need to do diff --git a/pykickstart.spec b/pykickstart.spec index 75d9a89..b699703 100644 --- a/pykickstart.spec +++ b/pykickstart.spec @@ -21,6 +21,7 @@ Url: http://fedoraproject.org/wiki/pykickstart # within this srpm. Source0: %{name}-%{version}.tar.gz Patch0: pykickstart-rhbz1578930.patch +Patch1: pykickstart-translation-canary.patch BuildArch: noarch @@ -79,6 +80,7 @@ the pykickstart package. %prep %setup -q %patch0 -p1 +%patch1 -p1 %if %{with python2} rm -rf %{py3dir} @@ -146,6 +148,7 @@ make PYTHON=%{__python3} test %changelog * Tue May 22 2018 David Cantrell - 3.14-2 - Include the _sortCommand to the _setCommand method (vponcova, #1578930) +- Remove call to xgettext_werror.sh during build * Mon May 14 2018 David Cantrell - 3.14-1 - Increment version to 3.14 (dcantrell)