From 1df0bf579d8b753ba6f3d4d6b66f2d6fb7635c89 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 1 Aug 2019 12:35:55 -0400 Subject: [PATCH] import spacewalk-remote-utils-2.8.4-5.module+el8.1.0+3115+d1f204ad --- .gitignore | 1 + .spacewalk-remote-utils.metadata | 1 + ...o-spacewalk-remote-utils-2.8.4-2-el8.patch | 23 ++ ...o-spacewalk-remote-utils-2.8.4-3-el8.patch | 27 +++ ...o-spacewalk-remote-utils-2.8.4-4-el8.patch | 40 ++++ ...o-spacewalk-remote-utils-2.8.4-5-el8.patch | 78 +++++++ SPECS/spacewalk-remote-utils.spec | 218 ++++++++++++++++++ 7 files changed, 388 insertions(+) create mode 100644 .gitignore create mode 100644 .spacewalk-remote-utils.metadata create mode 100644 SOURCES/spacewalk-remote-utils-2.8.4-1-to-spacewalk-remote-utils-2.8.4-2-el8.patch create mode 100644 SOURCES/spacewalk-remote-utils-2.8.4-2-el8-to-spacewalk-remote-utils-2.8.4-3-el8.patch create mode 100644 SOURCES/spacewalk-remote-utils-2.8.4-3-el8-to-spacewalk-remote-utils-2.8.4-4-el8.patch create mode 100644 SOURCES/spacewalk-remote-utils-2.8.4-4-el8-to-spacewalk-remote-utils-2.8.4-5-el8.patch create mode 100644 SPECS/spacewalk-remote-utils.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ce2121c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/spacewalk-remote-utils-2.8.4.tar.gz diff --git a/.spacewalk-remote-utils.metadata b/.spacewalk-remote-utils.metadata new file mode 100644 index 0000000..fd05167 --- /dev/null +++ b/.spacewalk-remote-utils.metadata @@ -0,0 +1 @@ +5268a6aab2b8bf96fe54ca6a4f682d69df485d57 SOURCES/spacewalk-remote-utils-2.8.4.tar.gz diff --git a/SOURCES/spacewalk-remote-utils-2.8.4-1-to-spacewalk-remote-utils-2.8.4-2-el8.patch b/SOURCES/spacewalk-remote-utils-2.8.4-1-to-spacewalk-remote-utils-2.8.4-2-el8.patch new file mode 100644 index 0000000..c107f6a --- /dev/null +++ b/SOURCES/spacewalk-remote-utils-2.8.4-1-to-spacewalk-remote-utils-2.8.4-2-el8.patch @@ -0,0 +1,23 @@ +diff --git a/spacewalk-remote-utils.spec b/spacewalk-remote-utils.spec +index 8213ffc2e7..dd84f73ad8 100644 +--- a/spacewalk-remote-utils.spec ++++ b/spacewalk-remote-utils.spec +@@ -4,7 +4,7 @@ + + Name: spacewalk-remote-utils + Version: 2.8.4 +-Release: 1%{?dist} ++Release: 2%{?dist} + Summary: Utilities to interact with a Red Hat Satellite or Spacewalk server remotely. + + License: GPLv2 +@@ -62,6 +62,9 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp + %doc %{_mandir}/man1/spacewalk-create-channel.1.gz + + %changelog ++* Mon Mar 05 2018 Tomas Kasparek 2.8.4-2 ++- rebuild for rhel8 ++ + * Fri Feb 09 2018 Michael Mraka 2.8.4-1 + - removed Group from specfile + diff --git a/SOURCES/spacewalk-remote-utils-2.8.4-2-el8-to-spacewalk-remote-utils-2.8.4-3-el8.patch b/SOURCES/spacewalk-remote-utils-2.8.4-2-el8-to-spacewalk-remote-utils-2.8.4-3-el8.patch new file mode 100644 index 0000000..8e1b3bb --- /dev/null +++ b/SOURCES/spacewalk-remote-utils-2.8.4-2-el8-to-spacewalk-remote-utils-2.8.4-3-el8.patch @@ -0,0 +1,27 @@ +diff --git a/spacewalk-remote-utils.spec b/spacewalk-remote-utils.spec +index dd84f73ad8..7872e72197 100644 +--- a/spacewalk-remote-utils.spec ++++ b/spacewalk-remote-utils.spec +@@ -1,10 +1,10 @@ +-%if 0%{?fedora} ++%if 0%{?fedora} || 0%{?rhel} >= 8 + %global build_py3 1 + %endif + + Name: spacewalk-remote-utils + Version: 2.8.4 +-Release: 2%{?dist} ++Release: 3%{?dist} + Summary: Utilities to interact with a Red Hat Satellite or Spacewalk server remotely. + + License: GPLv2 +@@ -62,6 +62,9 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp + %doc %{_mandir}/man1/spacewalk-create-channel.1.gz + + %changelog ++* Wed Mar 14 2018 Tomas Kasparek 2.8.4-3 ++- build spacewalk-remote-utils for python3 (tkasparek@redhat.com) ++ + * Mon Mar 05 2018 Tomas Kasparek 2.8.4-2 + - rebuild for rhel8 + diff --git a/SOURCES/spacewalk-remote-utils-2.8.4-3-el8-to-spacewalk-remote-utils-2.8.4-4-el8.patch b/SOURCES/spacewalk-remote-utils-2.8.4-3-el8-to-spacewalk-remote-utils-2.8.4-4-el8.patch new file mode 100644 index 0000000..ab37a11 --- /dev/null +++ b/SOURCES/spacewalk-remote-utils-2.8.4-3-el8-to-spacewalk-remote-utils-2.8.4-4-el8.patch @@ -0,0 +1,40 @@ +diff --git a/spacewalk-remote-utils.spec b/spacewalk-remote-utils.spec +index 7872e72197..d096f61ad7 100644 +--- a/spacewalk-remote-utils.spec ++++ b/spacewalk-remote-utils.spec +@@ -4,7 +4,7 @@ + + Name: spacewalk-remote-utils + Version: 2.8.4 +-Release: 3%{?dist} ++Release: 4%{?dist} + Summary: Utilities to interact with a Red Hat Satellite or Spacewalk server remotely. + + License: GPLv2 +@@ -12,12 +12,14 @@ URL: https://github.com/spacewalkproject/spacewalk + Source: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz + BuildArch: noarch + +-%if 0%{?build_py} ++%if 0%{?build_py3} + BuildRequires: python3-devel + Requires: python3-rhnlib ++Requires: python3-pygpgme + %else + BuildRequires: python-devel + Requires: rhnlib >= 2.8.4 ++Requires: pygpgme + %if 0%{?suse_version} + # provide directories for filelist check in OBS + BuildRequires: rhn-client-tools +@@ -62,6 +64,10 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp + %doc %{_mandir}/man1/spacewalk-create-channel.1.gz + + %changelog ++* Mon May 14 2018 Tomas Kasparek 2.8.4-4 ++- Related: #1577219 - explicitly require pygpgme (tkasparek@redhat.com) ++- Resolves: #1577219 - fix build macro for python3 (tkasparek@redhat.com) ++ + * Wed Mar 14 2018 Tomas Kasparek 2.8.4-3 + - build spacewalk-remote-utils for python3 (tkasparek@redhat.com) + diff --git a/SOURCES/spacewalk-remote-utils-2.8.4-4-el8-to-spacewalk-remote-utils-2.8.4-5-el8.patch b/SOURCES/spacewalk-remote-utils-2.8.4-4-el8-to-spacewalk-remote-utils-2.8.4-5-el8.patch new file mode 100644 index 0000000..ceb0f80 --- /dev/null +++ b/SOURCES/spacewalk-remote-utils-2.8.4-4-el8-to-spacewalk-remote-utils-2.8.4-5-el8.patch @@ -0,0 +1,78 @@ +diff --git a/spacewalk-add-providers/spacewalk-add-providers b/spacewalk-add-providers/spacewalk-add-providers +index 2bad499390..c925d7f177 100755 +--- a/spacewalk-add-providers/spacewalk-add-providers ++++ b/spacewalk-add-providers/spacewalk-add-providers +@@ -4,14 +4,20 @@ + # + + from optparse import Option, OptionParser ++from socket import gethostname + import logging, os, shutil, sys, tempfile + + if sys.version_info[0] == 3: + import xmlrpc.client as xmlrpclib + else: + import xmlrpclib +-import gpgme +-from socket import gethostname ++ ++try: ++ import gpg ++ has_gpgme = False ++except ImportError: ++ import gpgme ++ has_gpgme = True + + opts = [ Option('-u', '--username'), + Option('-p', '--password'), +@@ -71,9 +77,12 @@ for key_file in args: + + # read the key's provider and ID + try: +- ctx = gpgme.Context() +- +- result = ctx.import_(open(key_file, 'rb')) ++ if has_gpgme: ++ ctx = gpgme.Context() ++ result = ctx.import_(open(key_file, 'rb')) ++ else: ++ ctx = gpg.Context() ++ result = ctx.op_import(open(key_file, 'rb')) + + for key in ctx.keylist(): + provider_name = key.uids[0].name +diff --git a/spacewalk-remote-utils.spec b/spacewalk-remote-utils.spec +index d096f61ad7..017b022505 100644 +--- a/spacewalk-remote-utils.spec ++++ b/spacewalk-remote-utils.spec +@@ -4,7 +4,7 @@ + + Name: spacewalk-remote-utils + Version: 2.8.4 +-Release: 4%{?dist} ++Release: 5%{?dist} + Summary: Utilities to interact with a Red Hat Satellite or Spacewalk server remotely. + + License: GPLv2 +@@ -15,7 +15,7 @@ BuildArch: noarch + %if 0%{?build_py3} + BuildRequires: python3-devel + Requires: python3-rhnlib +-Requires: python3-pygpgme ++Requires: python3-gpg + %else + BuildRequires: python-devel + Requires: rhnlib >= 2.8.4 +@@ -64,6 +64,12 @@ docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./sp + %doc %{_mandir}/man1/spacewalk-create-channel.1.gz + + %changelog ++* Tue Nov 06 2018 Tomas Kasparek 2.8.4-5 ++- Related: #1633532 - require python-gpg instead of python-gpgme where possible ++ (tkasparek@redhat.com) ++- Resolves: #1633532 - use python-gpg instead of python-gpgme where possible ++ (tkasparek@redhat.com) ++ + * Mon May 14 2018 Tomas Kasparek 2.8.4-4 + - Related: #1577219 - explicitly require pygpgme (tkasparek@redhat.com) + - Resolves: #1577219 - fix build macro for python3 (tkasparek@redhat.com) diff --git a/SPECS/spacewalk-remote-utils.spec b/SPECS/spacewalk-remote-utils.spec new file mode 100644 index 0000000..c4fd912 --- /dev/null +++ b/SPECS/spacewalk-remote-utils.spec @@ -0,0 +1,218 @@ +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global build_py3 1 +%endif + +Name: spacewalk-remote-utils +Version: 2.8.4 +Release: 5%{?dist} +Summary: Utilities to interact with a Red Hat Satellite or Spacewalk server remotely. + +License: GPLv2 +URL: https://github.com/spacewalkproject/spacewalk +Source: https://github.com/spacewalkproject/spacewalk/archive/%{name}-%{version}.tar.gz +Patch0: spacewalk-remote-utils-2.8.4-1-to-spacewalk-remote-utils-2.8.4-2-el8.patch +Patch1: spacewalk-remote-utils-2.8.4-2-el8-to-spacewalk-remote-utils-2.8.4-3-el8.patch +Patch2: spacewalk-remote-utils-2.8.4-3-el8-to-spacewalk-remote-utils-2.8.4-4-el8.patch +Patch3: spacewalk-remote-utils-2.8.4-4-el8-to-spacewalk-remote-utils-2.8.4-5-el8.patch +BuildArch: noarch + +%if 0%{?build_py3} +BuildRequires: python3-devel +Requires: python3-rhnlib +Requires: python3-gpg +%else +BuildRequires: python-devel +Requires: rhnlib >= 2.8.4 +Requires: pygpgme +%if 0%{?suse_version} +# provide directories for filelist check in OBS +BuildRequires: rhn-client-tools +%endif +%endif +BuildRequires: docbook-utils + +%description +Utilities to interact with a Red Hat Satellite or Spacewalk server remotely over XMLRPC. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +%build +docbook2man ./spacewalk-create-channel/doc/spacewalk-create-channel.sgml -o ./spacewalk-create-channel/doc/ +%if 0%{?build_py3} + sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' ./spacewalk-create-channel/spacewalk-create-channel + sed -i 's|#!/usr/bin/python|#!/usr/bin/python3|' ./spacewalk-add-providers/spacewalk-add-providers +%endif + +%install +%{__rm} -rf %{buildroot} + +%{__mkdir_p} %{buildroot}/%{_bindir} +%{__install} -p -m0755 spacewalk-add-providers/spacewalk-add-providers %{buildroot}/%{_bindir}/ +%{__install} -p -m0755 spacewalk-create-channel/spacewalk-create-channel %{buildroot}/%{_bindir}/ + +%{__mkdir_p} %{buildroot}/%{_datadir}/rhn/channel-data +%{__install} -p -m0644 spacewalk-create-channel/data/* %{buildroot}/%{_datadir}/rhn/channel-data/ + +%{__mkdir_p} %{buildroot}/%{_mandir}/man1 +%{__gzip} -c ./spacewalk-create-channel/doc/spacewalk-create-channel.1 > %{buildroot}/%{_mandir}/man1/spacewalk-create-channel.1.gz + +%clean +%{__rm} -rf %{buildroot} + +%files +%{_bindir}/spacewalk-add-providers +%{_bindir}/spacewalk-create-channel +%{_datadir}/rhn/channel-data/ +%doc spacewalk-create-channel/doc/README spacewalk-create-channel/doc/COPYING +%doc %{_mandir}/man1/spacewalk-create-channel.1.gz + +%changelog +* Tue Nov 06 2018 Tomas Kasparek 2.8.4-5 +- Related: #1633532 - require python-gpg instead of python-gpgme where possible + (tkasparek@redhat.com) +- Resolves: #1633532 - use python-gpg instead of python-gpgme where possible + (tkasparek@redhat.com) + +* Mon May 14 2018 Tomas Kasparek 2.8.4-4 +- Related: #1577219 - explicitly require pygpgme (tkasparek@redhat.com) +- Resolves: #1577219 - fix build macro for python3 (tkasparek@redhat.com) + +* Wed Mar 14 2018 Tomas Kasparek 2.8.4-3 +- build spacewalk-remote-utils for python3 (tkasparek@redhat.com) + +* Mon Mar 05 2018 Tomas Kasparek 2.8.4-2 +- rebuild for rhel8 + +* Fri Feb 09 2018 Michael Mraka 2.8.4-1 +- removed Group from specfile + +* Tue Oct 10 2017 Michael Mraka 2.8.3-1 +- make python2/3 defs consistent with other specs + +* Thu Sep 07 2017 Michael Mraka 2.8.2-1 +- removed unnecessary BuildRoot tag + +* Wed Sep 06 2017 Michael Mraka 2.8.1-1 +- purged changelog entries for Spacewalk 2.0 and older +- Bumping package versions for 2.8. + +* Wed Aug 09 2017 Tomas Kasparek 2.7.8-1 +- 1161715 - add newline before list of arguments + +* Fri Aug 04 2017 Michael Mraka 2.7.7-1 +- 1474345 - fixed script output + +* Fri Aug 04 2017 Tomas Kasparek 2.7.6-1 +- 1161715 - spacewalk-create-channel man page options + +* Thu Aug 03 2017 Michael Mraka 2.7.5-1 +- 1474345 - update spacewalk-remote-utils with RHEL 7.4 channel definitions + +* Wed Apr 05 2017 Jiri Dostal 2.7.4-1 +- 1439097 - Update spacewalk-remote-utils with RHEL 6.9 channel definitions +- Use HTTPS in all Github links +- Updated links to github in spec files +- Migrating Fedorahosted to GitHub + +* Wed Dec 07 2016 Jiri Dostal 2.7.3-1 +- python 3 requires print with parentheses File /usr/bin/spacewalk-create- + channel, line 443 print fullDir ^ SyntaxError: Missing + parentheses in call to 'print' + +* Thu Dec 01 2016 Jiri Dostal 2.7.2-1 +- Updating spacewalk-create-channel to gather Supplementary channels +- Supplementary channels for RHEL 7.3 channel definitions + +* Mon Nov 28 2016 Jiri Dostal 2.7.1-1 +- update of spacewalk-remote-utils with RHEL 7.3 channel definitions +- Bumping package versions for 2.7. + +* Mon May 30 2016 Tomas Kasparek 2.6.1-1 +- add supplementary channanels to spacewalk-create-channel +- Bumping package versions for 2.6. + +* Wed May 18 2016 Tomas Kasparek 2.5.5-1 +- convert string and print in spacewalk-create-channel to work in python 3 + +* Wed May 18 2016 Tomas Kasparek 2.5.4-1 +- update spacewalk-remote-utils with RHEL 6.8 content + +* Thu May 12 2016 Gennadii Altukhov 2.5.3-1 +- change build dependency on python-devel, because we don't use Python3 during + package building + +* Mon Apr 25 2016 Gennadii Altukhov 2.5.2-1 +- Make spacewalk-remote-utils compatible with Python 2 and 3 +- Fix indentation to default 4 spaces + +* Fri Nov 20 2015 Tomas Kasparek 2.5.1-1 +- add RHEL 7.2 channel definitions +- Bumping package versions for 2.5. + +* Wed Sep 09 2015 Jiri Dostal 2.4.5-1 +- RFE 1257652 - spacewalk-create-channel added -o option to clone channel to + current state + +* Fri Aug 07 2015 Jan Dobes 2.4.4-1 +- use hostname instead of localhost for https connections + +* Mon Aug 03 2015 Tomas Kasparek 2.4.3-1 +- channel definitions for rhel 6.7 + +* Mon Apr 13 2015 Tomas Kasparek 2.4.2-1 +- channel definitions for rhel 7.1 +- update channel definitions + +* Thu Apr 02 2015 Jan Dobes 2.4.1-1 +- require more recent rhnlib +- Bumping package versions for 2.4. + +* Wed Feb 18 2015 Matej Kollar 2.3.7-1 +- Updating function names +- Setting ts=4 is wrong + +* Wed Jan 14 2015 Matej Kollar 2.3.6-1 +- Getting rid of Tabs and trailing spaces in Python +- Getting rid of Tabs and trailing spaces in LICENSE, COPYING, and README files + +* Fri Nov 28 2014 Tomas Lestach 2.3.5-1 +- 1161787 - Option "--name" of sw-create-channel is not documented correctly in + the man page. + +* Fri Nov 07 2014 Michael Mraka 2.3.4-1 +- 1158840 - missing RHEL6.6 subrepos +- 1158840 - compose subrepos don't contain listing in RHEL6.6 + +* Mon Nov 03 2014 Michael Mraka 2.3.3-1 +- 1158840 - channel definitions for RHEL 6.6 +- compose format has slightly changed for RHEL6.6 + +* Tue Sep 16 2014 Michael Mraka 2.3.2-1 +- 1142172 - channel definitions for RHEL 5.11 + +* Fri Aug 01 2014 Michael Mraka 2.3.1-1 +- 1121352 - sw-create-channel 6-gold-server-x86_64 data file out-of-date + +* Thu Jun 26 2014 Milan Zazrivec 2.2.2-1 +- Channel content definitions for RHEL-7.0 +- 1112391 - recognize RHEL-7 compose structure + +* Mon Mar 31 2014 Stephen Herr 2.2.1-1 +- Fix channel arch on the spacewalk-create-channel man page +- Bumping package versions for 2.2. + +* Fri Jan 03 2014 Tomas Lestach 2.1.3-1 +- don't print traceback when entered incorrect credentials + +* Wed Nov 27 2013 Tomas Lestach 2.1.2-1 +- 1035288 - channel definitions for RHEL6.5 + +* Mon Nov 11 2013 Tomas Lestach 2.1.1-1 +- 1020665 - channel definitions for RHEL-5-U10 +- Bumping package versions for 2.1. +