From 46aae073fbf607e50760af8cb495663fb2c94ff9 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Mon, 12 Jan 2009 18:25:27 +0000 Subject: [PATCH] - Resolves: bz459845 collect krb5.conf - Resolves: bz457880 include output of xm list and xm list --long - Resolves: bz457919 add support for openswan and ipsec-tools - Resolves: bz456378 capture elilo configuration - Resolves: bz445007 s390 support - Resolves: bz371251 hangs when running with a xen kernel where xend has not been started - Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive - Resolves: bz445510 Do not rely on env to execute python - Resolves: bz446868 add support for emc devices - Resolves: bz453797 fails to generate fdisk -l - Resolves: bz433183 does not collect ext3 information - Resolves: bz444838 systool is passed deprecated arguments - Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection - Resolves: bz332211 avoid hazardous filenames --- rhsupport.pub | Bin 925 -> 0 bytes sos.spec | 65 +++++++++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 rhsupport.pub diff --git a/rhsupport.pub b/rhsupport.pub deleted file mode 100644 index e16079dbcb9eb8c0ecda950a14213369f9201ce7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 925 zcmV;O17iG{0ipy)1{A~*1OS;09#TTRP^~)4m;fNXHZyFf^n;D6;g(@bl(7=tXHU#R-J^q za}(XSCTFD3FA`wQ1O7R5ncrkgf65oi5$b6Ul}X4Kod(=RS-_Z+Sqp_LTWgTc9q2sU zN1r*_xBRLW7TkVJVIS%gvbL5H%xIT{!=Calwk5!RwDNJEF&#QqSw(usp;nLBBpMC1 z9`z6}R%q*j63UNbtmteewXblYbSKi%xLAgQAFfL}BMo({td;}+SA;L?Ky^cc85uMN zZ4%8GN9O;ljo&2YA4hrOXJa@sr8O%Xb|O(;XubJMghOLDQyCIU{a=kOhuLK{qrbka zwf>0w_nflSB)wz=P1~D2m&XG7637y2;GVg8^%tH*>t5oGi zc)}(6TCkomKHo{Xv^i2`WFSakbRbi8aBy#ObRZ~GZ&M&eZewzJaCB*JZXio#c_|<~ zb9HcVZ*p`%a%E&_VRSBIZ*4w^U<4Bp0stTd0!IcE!~z>51`7!Y2Ll2G6#@tY1Qr4V z0RkQY0vCV)3JDNJ!*r@qUI1fQzyO>Nvlro?&7TIKP)*1%*u~P|yteQFoD5>BU2h$u zr2#>G;fWpj1{73gm|5WRH!MXyl>eR zx$e;9^?(bs<35mI?N|OBQr14;O5;_;JI^%@5IX?tYyQEUjpFd#>OP#{l`p9-6;}W? zF@e>IwSTeKad@ZF5bOr?HVpJFd>JFUeXMyp)X;>E=t7MD4fgrFx1*xep(e9fBxCSZK#;+9>71jnUmncy$}68&1F zwY$#m_NyTEze~*#kMKii1iKLO8h57hLqUCIrXrWPaP+8^XDuz{CEJYQ@nxjel88wJ7!d*h2?YX21{A~s8w>yn2@plYbgEHa z0AplT0HBJz4T)gpa*Cv5WgGkjfC`d7R0#l}gO)H{`#tO9!wqQT*^s=TW1@>qxC^3l diff --git a/sos.spec b/sos.spec index 397ab08..ac5636d 100644 --- a/sos.spec +++ b/sos.spec @@ -5,22 +5,17 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 1.8 -Release: 3%{?dist} -Group: Applications/System -# The source for this package was pulled from upstream's svn. Use the -# following commands to generate the tarball: -# svn --username guest export https://sos.108.redhat.com/svn/sos/tags/r1-7 sos-1.7 -# tar -czvf sos-1.7.tar.gz sos-1.7 -Source0: %{name}-%{version}.tar.gz -Source1: rhsupport.pub +Release: 5%{?dist} +Group: Application/Tools +Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch -Url: https://hosted.fedoraproject.org/projects/sos +Url: http://fedorahosted.org/sos BuildRequires: python-devel Requires: libxml2-python Provides: sysreport = 1.4.3-13 -Obsoletes: sysreport < 1.4.3-13 +Obsoletes: sysreport %description Sos is a set of tools that gathers information about system @@ -36,40 +31,50 @@ support technicians and developers. %install rm -rf ${RPM_BUILD_ROOT} -install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/%{name}/rhsupport.pub -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT - -%find_lang %{name} -cd $RPM_BUILD_ROOT%{_sbindir} -ln -s sosreport sysreport +install -D -m644 gpgkeys/rhsupport.pub ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport %clean rm -rf ${RPM_BUILD_ROOT} -%files -f %{name}.lang +%files %defattr(-,root,root,-) -%{_sbindir}/sosreport -%{_datadir}/sos/ %{_bindir}/rh-upload-core +%{_sbindir}/sosreport %{_sbindir}/sysreport %{_sbindir}/sysreport.legacy -%{_datadir}/sysreport +/usr/share/sysreport +/usr/share/sos/rhsupport.pub %{python_sitelib}/sos/ -%{python_sitelib}/%{name}-0.0.0-py*.egg-info -%{_mandir}/man1/sosreport.1* +%{_mandir}/man1/sosreport.1.gz +%{_localedir}/*/LC_MESSAGES/sos.mo %doc README README.rh-upload-core TODO LICENSE ChangeLog -%config(noreplace) %{_sysconfdir}/sos.conf +%config %{_sysconfdir}/sos.conf %changelog -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.8-3 -- Rebuild for Python 2.6 +* Mon Dec 29 2008 Adam Stokes - 1.8-5 +- removed source defines as python manifest handles this -* Thu Sep 4 2008 Tom "spot" Callaway 1.8-2 -- more cleanups to get this package building +* Fri Dec 19 2008 Adam Stokes - 1.8-4 +- spec cleanup, fixed license, source +- reworked Makefile to build properly -* Thu Sep 4 2008 Tom "spot" Callaway 1.8-1 -- fix license tag -- undid stupid duplicate variable declarations (name, version, release) +* Thu Oct 23 2008 Adam Stokes - 1.8-1 +- Resolves: bz459845 collect krb5.conf +- Resolves: bz457880 include output of xm list and xm list --long +- Resolves: bz457919 add support for openswan and ipsec-tools +- Resolves: bz456378 capture elilo configuration +- Resolves: bz445007 s390 support +- Resolves: bz371251 hangs when running with a xen kernel where xend has not been started +- Resolves: bz452705 Add /root/anaconda-ks-cfg to sosreport archive +- Resolves: bz445510 Do not rely on env to execute python +- Resolves: bz446868 add support for emc devices +- Resolves: bz453797 fails to generate fdisk -l +- Resolves: bz433183 does not collect ext3 information +- Resolves: bz444838 systool is passed deprecated arguments +- Resolves: bz455096 add %{INSTALLTIME:date} to rpm --qf collection +- Resolves: bz332211 avoid hazardous filenames * Wed Nov 21 2007 Navid Sheikhol-Eslami - 1.8-0 - Resolves: bz368261 sosGetCommandOutput() does not block on hung processes diff --git a/sources b/sources index 7007522..9953632 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc839be48e8eb5b294e3c64cf0b8e65e sos-1.8.tar.gz +04ad06ffb0bc24f96f5704c0c577aaf8 sos-1.8.tar.gz