rpms/sos/F-9 sos.spec,1.2,1.3

[Adam Stokes]

Author: astokes

Update of /cvs/pkgs/rpms/sos/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11214

Modified Files:
	sos.spec 
Log Message:
updated sos.spec



Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-9/sos.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sos.spec	13 Dec 2007 10:37:05 -0000	1.2
+++ sos.spec	12 Jan 2009 18:34:05 -0000	1.3
@@ -1,26 +1,17 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define name sos
-%define version 1.8
-%define release 0
-
 %define _localedir %_datadir/locale
 
 Summary: A set of tools to gather troubleshooting information from a system
-Name: %{name}
-Version: %{version}
-Release: %{release}%{?dist}
+Name: sos
+Version: 1.8
+Release: 5%{?dist}
 Group: Application/Tools
-# 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
-License: GPL
+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
@@ -36,12 +27,12 @@
 %setup -q
 
 %build
-python setup.py build
+%{__python} setup.py build
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
-python setup.py install --optimize 1 --root=$RPM_BUILD_ROOT
+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
@@ -49,19 +40,42 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/rh-upload-core
 %{_sbindir}/sosreport
-/usr/share/sos/rhsupport.pub
-/usr/bin/rh-upload-core
-/usr/sbin/sysreport
-/usr/sbin/sysreport.legacy
+%{_sbindir}/sysreport
+%{_sbindir}/sysreport.legacy
 /usr/share/sysreport
+/usr/share/sos/rhsupport.pub
 %{python_sitelib}/sos/
-%{_mandir}/man1/sosreport.1*
+%{_mandir}/man1/sosreport.1.gz
 %{_localedir}/*/LC_MESSAGES/sos.mo
 %doc README README.rh-upload-core TODO LICENSE ChangeLog
-%config /etc/sos.conf
+%config %{_sysconfdir}/sos.conf
 
 %changelog
+* Mon Dec 29 2008 Adam Stokes <ajs at redhat dot com> - 1.8-5
+- removed source defines as python manifest handles this
+
+* Fri Dec 19 2008 Adam Stokes <ajs at redhat dot com> - 1.8-4
+- spec cleanup, fixed license, source
+- reworked Makefile to build properly
+
+* Thu Oct 23 2008 Adam Stokes <astokes at redhat dot com> - 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 <navid at redhat dot com> - 1.8-0
 - Resolves: bz368261 sosGetCommandOutput() does not block on hung processes
 - Resolves: bz361861 work-around missing traceback.format_exc() in RHEL4