Include the _sortCommand to the _setCommand method (vponcova, #1578930)

Remove call to xgettext_werror.sh during build
This commit is contained in:
David Cantrell 2018-05-22 16:27:24 -04:00
parent 17c2693c74
commit 32b654c733
2 changed files with 16 additions and 0 deletions

View File

@ -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

View File

@ -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 <dcantrell@redhat.com> - 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 <dcantrell@redhat.com> - 3.14-1
- Increment version to 3.14 (dcantrell)