merged navid-dev back into trunk, see spec file for details

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@457 ef72aa8b-4018-0410-8976-d6e080ef94d8

1 files changed, 34 insertions, 9 deletions

diff --git a/src/sos-internal.spec b/src/sos-internal.spec
index c5ddf950..2406175e 100644
--- a/src/sos-internal.spec
+++ b/src/sos-internal.spec
@@ -1,21 +1,24 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %define name sos-internal
-%define version 1.0
+%define version 1.8
 %define release 0
 
-Summary: Red Hat Support GPG private key
+Summary: SoS internal utilities for report analysis
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
 Group: Application/Tools
 
-Source0: rhsupport.pub
-Source1: rhsupport.key
+Source0: sos-%{version}.tar.gz
+Source1: rhsupport.pub
+Source2: rhsupport.key
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Url: http://hosted.fedoraproject.org/projects/sos
+Url: https://hosted.fedoraproject.org/projects/sos
+Requires: python-cherrypy
+Requires: python-sqlite2
 
 %description
 Sos is a set of tools that gathers information about system
@@ -23,22 +26,44 @@ hardware and configuration. The information can then be used for
 diagnostic purposes and debugging. Sos is commonly used to help
 support technicians and developers.
 
+%prep
+tar xfz %{SOURCE0}
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
-install -D -m600 %{SOURCE0} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
-install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.key
+
+cd sos-%{version}
+
+install -D -m755 extras/sos-open ${RPM_BUILD_ROOT}/usr/bin/sos-open
+install -D -m755 extras/sos-html-logs/sos-html-logs ${RPM_BUILD_ROOT}/usr/bin/sos-html-logs
+
+mkdir -p ${RPM_BUILD_ROOT}/%{python_sitelib}/soshtmllogs/parsers
+install -D -m644 extras/sos-html-logs/lib/*.py -t ${RPM_BUILD_ROOT}/%{python_sitelib}/soshtmllogs
+install -D -m644 extras/sos-html-logs/lib/parsers/*.py extras/sos-html-logs/lib/parsers/*.rules -t ${RPM_BUILD_ROOT}/%{python_sitelib}/soshtmllogs/parsers
+
+mkdir -p ${RPM_BUILD_ROOT}/usr/share
+cp -r extras/sos-html-logs/share ${RPM_BUILD_ROOT}/usr/share/sos-html-logs
+
+install -D -m644 %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.pub
+install -D -m600 %{SOURCE2} ${RPM_BUILD_ROOT}/usr/share/sos/rhsupport.key
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/usr/bin/gpg --import /usr/share/sos/rhsupport.pub
-/usr/bin/gpg --allow-secret-key-import --import /usr/share/sos/rhsupport.key
+echo -n "Importing GPG keys... "
+/usr/bin/gpg --import /usr/share/sos/rhsupport.pub &> /dev/null
+/usr/bin/gpg --allow-secret-key-import --import /usr/share/sos/rhsupport.key &> /dev/null
+echo "done."
 
 %files
 %defattr(-,root,root,-)
 /usr/share/sos/rhsupport.pub
 /usr/share/sos/rhsupport.key
+/usr/bin/sos-html-logs
+/usr/bin/sos-open
+/%{python_sitelib}/soshtmllogs
+/usr/share/sos-html-logs
 
 %changelog
 * Wed Sep  4 2007 Navid Sheikhol-Eslami <navid at redhat dot com> - 1.0