[sos] Update to upstream sos-3.2alpha1
Bryn Reeves
bmr at fedoraproject.org
Tue Jun 17 21:21:35 UTC 2014
commit 88f20830bded7435977c283fcc93ef7aa4d029bd
Author: Bryn M. Reeves <bmr at redhat.com>
Date: Tue Jun 17 22:17:42 2014 +0100
Update to upstream sos-3.2alpha1
Update to 3.2a1 and make specfile source URL handling comply with
the Fedora packaging guidelines for github projects.
0001-Fix-cluster-module-crm_report-support.patch | 81 -
...bsolete-diagnostics-code-from-ldap-plugin.patch | 36 -
...rclass-postproc-method-is-called-in-ldap-.patch | 39 -
0004-Fix-cluster-postproc-regression.patch | 29 -
0005-Fix-get_option-use-in-cluster-plugin.patch | 32 -
0006-Fix-verbose-file-logging.patch | 44 -
...ays-treat-rhevm-vdsmlogs-option-as-string.patch | 33 -
0008-Add-rhsm-debug-collection-to-yum-plugin.patch | 26 -
...ke-get_cmd_output_now-behaviour-match-2.2.patch | 35 -
...-geo-replication-status-in-gluster-plugin.patch | 34 -
0011-postgresql-minor-fixes.patch | 132 --
...postgresql-add-logs-about-errors-warnings.patch | 68 -
0013-postgresql-added-license-and-copyright.patch | 41 -
0014-postgresql-allow-use-TCP-socket.patch | 56 -
0015-Pass-no-archive-to-rhsm-debug-script.patch | 31 -
...ed-fds-are-closed-when-calling-subprocess.patch | 81 -
0017-Fix-gluster-volume-name-extraction.patch | 31 -
0018-Add-distupgrade-plugin.patch | 65 -
...Fix-command-output-substitution-exception.patch | 49 -
...or-message-when-cluster.crm_from-is-inval.patch | 38 -
...ove-useless-check_enabled-from-sar-plugin.patch | 38 -
...hard-coded-var-log-sa-paths-in-sar-plugin.patch | 40 -
...p_default_authtok-password-in-sssd-plugin.patch | 38 -
...-package-check-with-file-check-in-anacron.patch | 33 -
0025-Remove-the-rhevm-plugin.patch | 51 -
...c-Move-VPD-related-tool-under-common-code.patch | 45 -
0027-Add-PowerNV-specific-debug-data.patch | 33 -
...ng-use-of-obsolete-get_cmd_dir-in-plugins.patch | 44 -
0029-Update-systemd-support.patch | 35 -
0030-Add-tuned-plugin.patch | 53 -
...t_cmd_path-make_cmd_path-make_cmd_dirs-me.patch | 173 --
...oken-binary-detection-in-satellite-plugin.patch | 35 -
...-Rename-validatePlugin-to-validate_plugin.patch | 44 -
...olicy_tests.py-for-validate_plugin-change.patch | 50 -
0035-Match-plugins-against-policies.patch | 150 --
0036-Do-not-collect-isos-in-cobbler-plugin.patch | 24 -
0037-Call-rhsm-debug-with-the-sos-switch.patch | 26 -
0038-Fix-plugin_test-exception-on-six.PY2.patch | 32 -
0039-Remove-profile-support.patch | 244 ---
0040-Dead-code-removal-sos_relative_path.patch | 78 -
0041-Dead-code-removal-DirTree.patch | 146 --
0042-Dead-code-removal-utilities.checksum.patch | 72 -
0043-Add-vim-tags-to-all-python-source-files.patch | 1830 --------------------
...ad-code-removal-sos.plugins.common_prefix.patch | 39 -
0045-Dead-code-removal-PluginException.patch | 31 -
0046-Convert-infiniband-to-package-list.patch | 33 -
...elf.policy-.pkg_by_name-us-in-Logs-plugin.patch | 28 -
...ean-up-package-checks-in-processor-plugin.patch | 52 -
0049-Pythonify-Plugin._path_in_pathlist.patch | 29 -
...ix-x86-arch-detection-in-processor-plugin.patch | 26 -
0051-Refactor-Plugin.collect-pathway.patch | 152 --
...lete-checksum-reference-from-utilities_te.patch | 27 -
...plugin_tests.py-to-match-new-method-names.patch | 54 -
0054-Drop-RedHatPlugin-from-procenv.patch | 32 -
...e-sub-parameter-from-Plugin.add_copy_spec.patch | 164 --
...rences-to-sub-parameter-from-plugin-tests.patch | 46 -
0057-Use-a-set-for-Plugin.copy_paths.patch | 58 -
...Plugin-tests-to-treat-copy_paths-as-a-set.patch | 26 -
...s-for-Plugin.add_copy_spec-add_copy_specs.patch | 61 -
...eError-if-add_copy_specs-is-called-with-a.patch | 48 -
...ion-of-grub-configuration-for-UEFI-system.patch | 61 -
sos-silence-could-not-run.patch | 24 -
sos.spec | 137 +--
63 files changed, 10 insertions(+), 5413 deletions(-)
---
diff --git a/sos.spec b/sos.spec
index a8474b3..86f4fc3 100644
--- a/sos.spec
+++ b/sos.spec
@@ -1,11 +1,12 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
+%global commit 55c89eb6810e7060845082845653b059aab90e3d
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
-Version: 3.1
-Release: 2%{?dist}
+Version: 3.2
+Release: 0.1.a%{?dist}
Group: Applications/System
-Source0: https://github.com/sosreport/sosreport/archive/sos-3.1.tar.gz
+Source0: https://github.com/sosreport/sos/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
@@ -17,67 +18,6 @@ Requires: rpm-python
Requires: tar
Requires: bzip2
Requires: xz
-Patch0: 0001-Fix-cluster-module-crm_report-support.patch
-Patch1: 0002-Remove-obsolete-diagnostics-code-from-ldap-plugin.patch
-Patch2: 0003-Ensure-superclass-postproc-method-is-called-in-ldap-.patch
-Patch3: 0004-Fix-cluster-postproc-regression.patch
-Patch4: 0005-Fix-get_option-use-in-cluster-plugin.patch
-Patch5: 0006-Fix-verbose-file-logging.patch
-Patch6: 0007-Always-treat-rhevm-vdsmlogs-option-as-string.patch
-Patch7: 0008-Add-rhsm-debug-collection-to-yum-plugin.patch
-Patch8: 0009-Make-get_cmd_output_now-behaviour-match-2.2.patch
-Patch9: 0010-Include-geo-replication-status-in-gluster-plugin.patch
-Patch10: 0011-postgresql-minor-fixes.patch
-Patch11: 0012-postgresql-add-logs-about-errors-warnings.patch
-Patch12: 0013-postgresql-added-license-and-copyright.patch
-Patch13: 0014-postgresql-allow-use-TCP-socket.patch
-Patch14: 0015-Pass-no-archive-to-rhsm-debug-script.patch
-Patch15: 0016-Ensure-unused-fds-are-closed-when-calling-subprocess.patch
-Patch16: 0017-Fix-gluster-volume-name-extraction.patch
-Patch17: 0018-Add-distupgrade-plugin.patch
-Patch18: 0019-Fix-command-output-substitution-exception.patch
-Patch19: 0020-Improve-error-message-when-cluster.crm_from-is-inval.patch
-Patch20: 0021-Remove-useless-check_enabled-from-sar-plugin.patch
-Patch21: 0022-Eliminate-hard-coded-var-log-sa-paths-in-sar-plugin.patch
-Patch22: 0023-Scrub-ldap_default_authtok-password-in-sssd-plugin.patch
-Patch23: 0024-Replace-package-check-with-file-check-in-anacron.patch
-Patch24: 0025-Remove-the-rhevm-plugin.patch
-Patch25: 0026-powerpc-Move-VPD-related-tool-under-common-code.patch
-Patch26: 0027-Add-PowerNV-specific-debug-data.patch
-Patch27: 0028-Fix-remaining-use-of-obsolete-get_cmd_dir-in-plugins.patch
-Patch28: 0029-Update-systemd-support.patch
-Patch29: 0030-Add-tuned-plugin.patch
-Patch30: 0031-Clean-up-get_cmd_path-make_cmd_path-make_cmd_dirs-me.patch
-Patch31: 0032-Fix-broken-binary-detection-in-satellite-plugin.patch
-Patch32: 0033-Rename-validatePlugin-to-validate_plugin.patch
-Patch33: 0034-Update-policy_tests.py-for-validate_plugin-change.patch
-Patch34: 0035-Match-plugins-against-policies.patch
-Patch35: 0036-Do-not-collect-isos-in-cobbler-plugin.patch
-Patch36: 0037-Call-rhsm-debug-with-the-sos-switch.patch
-Patch37: 0038-Fix-plugin_test-exception-on-six.PY2.patch
-Patch38: 0039-Remove-profile-support.patch
-Patch39: 0040-Dead-code-removal-sos_relative_path.patch
-Patch40: 0041-Dead-code-removal-DirTree.patch
-Patch41: 0042-Dead-code-removal-utilities.checksum.patch
-Patch42: 0043-Add-vim-tags-to-all-python-source-files.patch
-Patch43: 0044-Dead-code-removal-sos.plugins.common_prefix.patch
-Patch44: 0045-Dead-code-removal-PluginException.patch
-Patch45: 0046-Convert-infiniband-to-package-list.patch
-Patch46: 0047-Replace-self.policy-.pkg_by_name-us-in-Logs-plugin.patch
-Patch47: 0048-Clean-up-package-checks-in-processor-plugin.patch
-Patch48: 0049-Pythonify-Plugin._path_in_pathlist.patch
-Patch49: 0050-Fix-x86-arch-detection-in-processor-plugin.patch
-Patch50: 0051-Refactor-Plugin.collect-pathway.patch
-Patch51: 0052-Remove-obsolete-checksum-reference-from-utilities_te.patch
-Patch52: 0053-Update-plugin_tests.py-to-match-new-method-names.patch
-Patch53: 0054-Drop-RedHatPlugin-from-procenv.patch
-Patch54: 0055-Remove-sub-parameter-from-Plugin.add_copy_spec.patch
-Patch55: 0056-Remove-references-to-sub-parameter-from-plugin-tests.patch
-Patch56: 0057-Use-a-set-for-Plugin.copy_paths.patch
-Patch57: 0058-Update-Plugin-tests-to-treat-copy_paths-as-a-set.patch
-Patch58: 0059-Add-tests-for-Plugin.add_copy_spec-add_copy_specs.patch
-Patch59: 0060-Raise-a-TypeError-if-add_copy_specs-is-called-with-a.patch
-Patch60: 0061-Add-collection-of-grub-configuration-for-UEFI-system.patch
%description
Sos is a set of tools that gathers information about system
@@ -87,68 +27,7 @@ support technicians and developers.
%prep
# deal with github tarball naming scheme
-%setup -q -n sosreport-sos-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
+%setup -q -n %{name}-%{commit}
%build
make
@@ -171,6 +50,10 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %{_sysconfdir}/sos.conf
%changelog
+* Tue Jun 17 2014 Bryn M. Reeves <bmr at redhat.com> = 3.2-0.1.a
+- Make source URL handling compliant with packaging guidelines
+- Update to new upstream pre-release sos-3.2-alpha1
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list