[sos/f19] Update to upstream sos-3.1
Bryn Reeves
bmr at fedoraproject.org
Tue Jun 17 23:15:06 UTC 2014
commit 3b47453bc7ba8385faddca4ceefb4bbdaa99f742
Author: Bryn M. Reeves <bmr at redhat.com>
Date: Tue Jun 17 22:37:16 2014 +0100
Update to upstream sos-3.1
Update to 3.1 and make specfile source URL handling comply with
the Fedora packaging guidelines for github projects.
.gitignore | 1 +
sos-Added-XFS-plugin.patch | 54 -----
...-exit-on-interactive-mode-read-exceptions.patch | 33 ---
sos-Fix-policy-classes-for--tmp-dir.patch | 35 ---
sos-No-TTY-should-not-imply-batch-mode.patch | 54 -----
sos-add-distupgrade-plugin.patch | 59 -----
sos-add-file-size-restriction-to-sar.patch | 84 -------
sos-add-krb5-plugin-and-klist.patch | 126 -----------
sos-add-nfs-client-plugin.patch | 65 ------
sos-add-powerpc-plugin.patch | 97 --------
sos-add-rhsm-debug-to-yum.patch | 21 --
sos-call-rhsm-debug-with-sos.patch | 23 --
sos-check-for-usable-temporary-directory.patch | 29 ---
sos-cluster-collect-crm_report.patch | 28 ---
...er-plugin-add-obfuscation-of-luci-secrets.patch | 28 ---
sos-collect-proc-self-mountstats.patch | 21 --
sos-collect-saved-vmcore-dmesg.patch | 43 ----
sos-collect-var-log-squid.patch | 20 --
sos-correct-log-and-message-levels.patch | 87 -------
sos-do-not-attempt-to-read-use-gss-proxy.patch | 35 ---
sos-fix-alloptions.patch | 35 ---
sos-fix-anacron-checks.patch | 28 ---
sos-fix-cluster-crm_report.patch | 72 ------
sos-fix-cluster-get_option-use.patch | 32 ---
...fix-command-output-substitution-exception.patch | 141 ------------
sos-fix-config-file-regression.patch | 51 -----
sos-fix-dash-dash-build-regressions.patch | 98 --------
sos-fix-fd-leaks-on-popen.patch | 74 ------
sos-fix-gluster-volume-name-extraction.patch | 26 ---
sos-fix-ldap-postproc.patch | 187 ----------------
sos-fix-multiple-plugin-opts.patch | 35 ---
sos-fix-rhel_version-problems.patch | 186 ---------------
sos-fix-traceback-when-sar-module.patch | 48 ----
sos-fix-typo-in-yum-add_forbidden_paths.patch | 26 ---
sos-fix-verbose-file-logging.patch | 38 ---
sos-gluster-include-geo-replication.patch | 70 ------
sos-include-etc-yaboot-conf-in-boot.patch | 20 --
sos-include-openhpi-config.patch | 116 ----------
sos-log-command-timeouts.patch | 71 ------
sos-make-ethernet-detection-more-robust.patch | 90 --------
sos-nis-add-domainname-output.patch | 17 --
sos-normalise-tmp-dir-path.patch | 31 ---
sos-pass-no-archive-to-rhsm-debug.patch | 26 ---
sos-remove-anaconda-ks-cfg-from-general.patch | 33 ---
sos-remove-logs-debug-statements.patch | 34 ---
...emove-pipe-communicate-newline-workaround.patch | 29 ---
sos-remove-rhel_version-from-yum-plugin.patch | 21 --
sos-remove-upload-option.patch | 236 --------------------
sos-remove-useless-os-path-check-for-brctl.patch | 37 ---
sos-remove-version-checks-in-gluster.patch | 40 ----
sos-restore-build-command-line-option.patch | 187 ----------------
...t-wbinfo-collection-to-the-current-domain.patch | 36 ---
sos-rhevm-treat-vdsmlogs-as-string.patch | 28 ---
sos-rpm-restricted-verify.patch | 98 --------
sos-silence-could-not-run.patch | 24 --
sos-strip-trailing-newline.patch | 25 --
sos-update-sos-ui-text.patch | 103 ---------
sos.spec | 126 +----------
sources | 2 +-
59 files changed, 11 insertions(+), 3509 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23ce7a6..9919571 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
sos-2.2.tar.gz
/sos-3.0.tar.gz
+/sos-30d85c9c776d8c204c66bb93e924ab8e7a92dd3b.tar.gz
diff --git a/sos.spec b/sos.spec
index 2e8b0eb..22ce642 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 30d85c9c776d8c204c66bb93e924ab8e7a92dd3b
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
-Version: 3.0
-Release: 23%{?dist}
+Version: 3.1
+Release: 1%{?dist}
Group: Applications/System
-Source0: https://people.redhat.com/breeves/sos/releases/sos-3.0.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,62 +18,6 @@ Requires: rpm-python
Requires: tar
Requires: bzip2
Requires: xz
-Patch0: sos-silence-could-not-run.patch
-Patch1: sos-strip-trailing-newline.patch
-Patch2: sos-fix-rhel_version-problems.patch
-Patch3: sos-cluster-collect-crm_report.patch
-Patch4: sos-No-TTY-should-not-imply-batch-mode.patch
-Patch5: sos-Do-not-exit-on-interactive-mode-read-exceptions.patch
-Patch6: sos-Fix-policy-classes-for--tmp-dir.patch
-Patch7: sos-Added-XFS-plugin.patch
-Patch8: sos-cluster-plugin-add-obfuscation-of-luci-secrets.patch
-Patch9: sos-restrict-wbinfo-collection-to-the-current-domain.patch
-Patch10: sos-do-not-attempt-to-read-use-gss-proxy.patch
-Patch11: sos-include-etc-yaboot-conf-in-boot.patch
-Patch12: sos-remove-useless-os-path-check-for-brctl.patch
-Patch13: sos-rpm-restricted-verify.patch
-Patch14: sos-remove-pipe-communicate-newline-workaround.patch
-Patch15: sos-add-file-size-restriction-to-sar.patch
-Patch16: sos-remove-version-checks-in-gluster.patch
-Patch17: sos-check-for-usable-temporary-directory.patch
-Patch18: sos-fix-alloptions.patch
-Patch19: sos-fix-config-file-regression.patch
-Patch20: sos-add-powerpc-plugin.patch
-Patch21: sos-collect-proc-self-mountstats.patch
-Patch22: sos-collect-var-log-squid.patch
-Patch23: sos-nis-add-domainname-output.patch
-Patch24: sos-normalise-tmp-dir-path.patch
-Patch25: sos-collect-saved-vmcore-dmesg.patch
-Patch26: sos-restore-build-command-line-option.patch
-Patch27: sos-add-nfs-client-plugin.patch
-Patch28: sos-fix-traceback-when-sar-module.patch
-Patch29: sos-fix-typo-in-yum-add_forbidden_paths.patch
-Patch30: sos-add-krb5-plugin-and-klist.patch
-Patch31: sos-fix-dash-dash-build-regressions.patch
-Patch32: sos-remove-logs-debug-statements.patch
-Patch33: sos-make-ethernet-detection-more-robust.patch
-Patch34: sos-fix-multiple-plugin-opts.patch
-Patch35: sos-correct-log-and-message-levels.patch
-Patch36: sos-log-command-timeouts.patch
-Patch37: sos-remove-upload-option.patch
-Patch38: sos-update-sos-ui-text.patch
-Patch39: sos-include-openhpi-config.patch
-Patch40: sos-fix-cluster-crm_report.patch
-Patch41: sos-fix-ldap-postproc.patch
-Patch42: sos-remove-anaconda-ks-cfg-from-general.patch
-Patch43: sos-fix-cluster-get_option-use.patch
-Patch44: sos-fix-verbose-file-logging.patch
-Patch45: sos-rhevm-treat-vdsmlogs-as-string.patch
-Patch46: sos-add-rhsm-debug-to-yum.patch
-Patch47: sos-gluster-include-geo-replication.patch
-Patch48: sos-pass-no-archive-to-rhsm-debug.patch
-Patch49: sos-fix-fd-leaks-on-popen.patch
-Patch50: sos-fix-gluster-volume-name-extraction.patch
-Patch51: sos-add-distupgrade-plugin.patch
-Patch52: sos-fix-command-output-substitution-exception.patch
-Patch53: sos-remove-rhel_version-from-yum-plugin.patch
-Patch54: sos-fix-anacron-checks.patch
-Patch55: sos-call-rhsm-debug-with-sos.patch
%description
Sos is a set of tools that gathers information about system
@@ -81,63 +26,7 @@ diagnostic purposes and debugging. Sos is commonly used to help
support technicians and developers.
%prep
-%setup -q
-%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
+%setup -qn %{name}-%{commit}
%build
make
@@ -161,6 +50,9 @@ rm -rf ${RPM_BUILD_ROOT}
%config(noreplace) %{_sysconfdir}/sos.conf
%changelog
+* Tue Jun 17 2014 Bryn M. Reeves <bmr at redhat.com> = 3.1-1
+- Update to sos-3.1 upstream release
+
* Thu Mar 20 2014 Bryn M. Reeves <bmr at redhat.com> = 3.0-23
- Call rhsm-debug with the --sos switch
diff --git a/sources b/sources
index 2df3930..f7f2226 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9963fc9934596ffd0adb585f8858a68c sos-3.0.tar.gz
+0c5ce678b5fd9bfe1782dd070501b721 sos-30d85c9c776d8c204c66bb93e924ab8e7a92dd3b.tar.gz
More information about the scm-commits
mailing list