import rhn-client-tools-2.8.16-13.module+el8.1.0+3455+3ddf2832

SPECS/rhn-client-tools.spec

@@ -15,7 +15,7 @@
 Summary: Support programs and libraries for Red Hat Satellite or Spacewalk
 Name: rhn-client-tools
 Version: 2.8.16
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Source0: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz
 Patch0: rhn-client-tools-2.8.16-1-to-rhn-client-tools-2.8.16-2-el8.patch
@@ -29,6 +29,7 @@ Patch7: rhn-client-tools-2.8.16-8-el8-to-rhn-client-tools-2.8.16-9-el8.patch
 Patch8: rhn-client-tools-2.8.16-9-el8-to-rhn-client-tools-2.8.16-10-el8.patch
 Patch9: rhn-client-tools-2.8.16-10-el8-to-rhn-client-tools-2.8.16-11-el8.patch
 Patch10: rhn-client-tools-2.8.16-11-el8-to-rhn-client-tools-2.8.16-12-el8.patch
+Patch11: rhn-client-tools-2.8.16-12-el8-to-rhn-client-tools-2.8.16-13-el8.patch
 URL:     https://github.com/spacewalkproject/spacewalk
 #BuildArch: noarch
 # see BZ 1617942 for more info as Requires are written into RPM headers
@@ -290,8 +291,6 @@ Requires: rhn-setup-gnome = %{version}-%{release}
 Requires: python-gnome python-gtk
 %else
 Requires: python3-gobject-base gtk3
-# gtk-builder-convert
-BuildRequires: gtk2-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel} > 5
 Requires: liberation-sans-fonts
@@ -315,12 +314,12 @@ Python 3 specific files for rhn-setup-gnome.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 make -f Makefile.rhn-client-tools
 
 %install
-export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
 %if 0%{?build_py2}
 make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} \
         PYTHONPATH=%{python_sitelib} PYTHONVERSION=%{python_version} \
@@ -329,16 +328,6 @@ make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} \
 %if 0%{?build_py3}
 sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' src/actions/*.py src/bin/*.py test/*.py
 make -f Makefile.rhn-client-tools
-for g in data/*.glade ; do
-        mv $g $g.old
-        gtk-builder-convert $g.old $g
-done
-sed -i 's/GTK_PROGRESS_LEFT_TO_RIGHT/horizontal/' data/progress.glade
-sed -i 's/GtkComboBox/GtkComboBoxText/; /property name="has_separator"/ d;' data/rh_register.glade
-sed -i '/class="GtkVBox"/ {
-                s/GtkVBox/GtkBox/;
-                a \ \ \ \ \ \ \ \ <property name="orientation">vertical</property\>
-                }' data/gui.glade
 make -f Makefile.rhn-client-tools install VERSION=%{version}-%{release} \
         PYTHONPATH=%{python3_sitelib} PYTHONVERSION=%{python3_version} \
         PREFIX=$RPM_BUILD_ROOT MANPATH=%{_mandir}
@@ -711,6 +700,9 @@ make -f Makefile.rhn-client-tools test
 %endif
 
 %changelog
+* Wed Apr 03 2019 Michael Mraka <michael.mraka@redhat.com> 2.8.16-13
+- Resolves: #1598450 - converted glade files into gtk3 format
+
 * Mon Feb 04 2019 Michael Mraka <michael.mraka@redhat.com> 2.8.16-12
 - Resolves: #1666099 - python3 is picky about bytes and string