rpms/sos/F-8 rhsupport.pub, 1.1, 1.2 sos.spec, 1.3, 1.4 sources, 1.4, 1.5
Navid Sheikhol-Eslami (navid)
fedora-extras-commits at redhat.com
Fri Dec 14 11:00:07 UTC 2007
Author: navid
Update of /cvs/pkgs/rpms/sos/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6267/F-8
Modified Files:
rhsupport.pub sos.spec sources
Log Message:
Index: rhsupport.pub
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-8/rhsupport.pub,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
Binary files /tmp/cvsT1Rqcb and /tmp/cvsxcJI1k differ
Index: sos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-8/sos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sos.spec 13 Dec 2007 12:51:05 -0000 1.3
+++ sos.spec 14 Dec 2007 10:59:32 -0000 1.4
@@ -2,7 +2,7 @@
%define name sos
%define version 1.8
-%define release 1pre0
+%define release 1pre2
%define _localedir %_datadir/locale
@@ -23,8 +23,10 @@
Url: https://hosted.fedoraproject.org/projects/sos
BuildRequires: python-devel
Requires: libxml2-python
+%if 0%{?rhel}
Provides: sysreport = 1.4.3-13
Obsoletes: sysreport
+%endif
%description
Sos is a set of tools that gathers information about system
@@ -42,7 +44,16 @@
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
+
+%if 0%{?rhel}
ln -s /usr/sbin/sosreport $RPM_BUILD_ROOT/usr/sbin/sysreport
+%endif
+%if ! 0%{?rhel}
+rm -f $RPM_BUILD_ROOT/usr/sbin/sysreport.legacy
+rm -f $RPM_BUILD_ROOT/usr/share/sysreport/functions
+rm -f $RPM_BUILD_ROOT/usr/share/sysreport/sysreport-fdisk
+rm -f $RPM_BUILD_ROOT/usr/share/sysreport/text.xsl
+%endif
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -52,9 +63,11 @@
%{_sbindir}/sosreport
/usr/share/sos/rhsupport.pub
/usr/bin/rh-upload-core
+%if 0%{?rhel}
/usr/sbin/sysreport
/usr/sbin/sysreport.legacy
/usr/share/sysreport
+%endif
%{python_sitelib}/sos/
%{_mandir}/man1/sosreport.1*
%{_localedir}/*/LC_MESSAGES/sos.mo
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sos/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 13 Dec 2007 12:51:05 -0000 1.4
+++ sources 14 Dec 2007 10:59:32 -0000 1.5
@@ -1 +1 @@
-ceace470a12a4ce794c6211be0c6aa03 sos-1.8.tar.gz
+543736ebb247fb8aa929728b175fd582 sos-1.8.tar.gz
More information about the scm-commits
mailing list