rpms
/
pykickstart
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:16:51 -04:00
parent f7ac832c9b
commit aa38733447
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pykickstart-translation-canary.patch Normal file
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

4
pykickstart.spec
View File

@ -23,6 +23,7 @@ Source0: %{name}-%{version}.tar.gz
Patch0: 0001-Add-support-for-fcoe-autovlan.patch
Patch1: 0002-Update-fcoe-command-help.patch
Patch2: pykickstart-rhbz1578930.patch
Patch3: pykickstart-translation-canary.patch
BuildArch: noarch
@ -88,6 +89,8 @@ the pykickstart package.
# For https://bugzilla.redhat.com/show_bug.cgi?id=1578930
%patch2 -p1
%patch3 -p1
%if %{with python2}
rm -rf %{py3dir}
mkdir %{py3dir}
@ -154,6 +157,7 @@ make PYTHON=%{__python3} test
%changelog
* Tue May 22 2018 David Cantrell <dcantrell@redhat.com> - 3.12-4
- Include the _sortCommand to the _setCommand method (vponcova, #1578930)
- Remove call to xgettext_werror.sh during build
* Mon Apr 16 2018 David Cantrell <dcantrell@redhat.com> - 3.12-3
- Upstream patches to support '--autovlan' option on fcoe command (#1564096)