Author: glen Date: Mon Jan 4 08:06:34 2010 GMT Module: packages Tag: HEAD ---- Log message: - some pldization
---- Files affected: packages/sosreport: sosreport.spec (1.1 -> 1.2) , pld.patch (NONE -> 1.1) (NEW), py-compiled.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/sosreport/sosreport.spec diff -u packages/sosreport/sosreport.spec:1.1 packages/sosreport/sosreport.spec:1.2 --- packages/sosreport/sosreport.spec:1.1 Sun Jan 3 19:04:11 2010 +++ packages/sosreport/sosreport.spec Mon Jan 4 09:06:29 2010 @@ -2,15 +2,17 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sosreport Version: 1.8 -Release: 0.1 +Release: 0.2 Group: Applications/System Source0: https://fedorahosted.org/releases/s/o/sos/sos-%{version}.tar.gz # Source0-md5: fc841fd760558594bb189d745fc67f0c License: GPL v2+ URL: http://fedorahosted.org/sos BuildRequires: python-devel +Patch0: pld.patch +Patch1: py-compiled.patch Requires: bzip2 -Requires: libxml2-python +Requires: python-libxml2 Requires: tar Provides: sysreport = 1.4.3-13 Obsoletes: sysreport @@ -25,9 +27,10 @@ %prep %setup -q -n sos-%{version} +%patch0 -p1 +%patch1 -p1 %build -export CFLAGS="%{rpmcflags}" %{__python} setup.py build %install @@ -61,6 +64,7 @@ %{_datadir}/sysreport %{_mandir}/man1/sosreport.1* +%dir %{py_sitescriptdir}/sos %dir %{py_sitescriptdir}/sos/plugins %{py_sitescriptdir}/sos/*.py[co] %{py_sitescriptdir}/sos/plugins/*.py[co] @@ -74,5 +78,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2010/01/04 08:06:29 glen +- some pldization + Revision 1.1 2010/01/03 18:04:11 glen - sos from fedora (use name sosreport as sos.spec already occupied) ================================================================ Index: packages/sosreport/pld.patch diff -u /dev/null packages/sosreport/pld.patch:1.1 --- /dev/null Mon Jan 4 09:06:35 2010 +++ packages/sosreport/pld.patch Mon Jan 4 09:06:29 2010 @@ -0,0 +1,27 @@ +--- sos-1.8/sosreport~ 2009-11-05 15:26:38.000000000 +0200 ++++ sos-1.8/sosreport 2010-01-04 00:22:41.520840013 +0200 +@@ -39,10 +39,7 @@ + from multiprocessing import Semaphore + + __version__ = 1.8 +-if os.path.isfile('/etc/fedora-release'): +- __distro__ = 'Fedora' +-else: +- __distro__ = 'Red Hat Enterprise Linux' ++__distro__ = 'PLD Linux' + + ## Set up routines to be linked to signals for termination handling + def exittermhandler(signum, frame): +--- sos-1.8/lib/sos/plugins/lsbrelease.py~ 2009-06-22 21:26:09.000000000 +0300 ++++ sos-1.8/lib/sos/plugins/lsbrelease.py 2010-01-04 00:28:54.048094306 +0200 +@@ -20,8 +20,8 @@ + """Linux Standard Base information + """ + def diagnose(self): +- if not os.path.exists("/etc/redhat-release"): +- self.addDiagnose("/etc/redhat-release missing") ++ if not os.path.exists("/etc/pld-release"): ++ self.addDiagnose("/etc/pld-release missing") + return + def setup(self): + self.collectExtOutput("/usr/bin/lsb_release -a") ================================================================ Index: packages/sosreport/py-compiled.patch diff -u /dev/null packages/sosreport/py-compiled.patch:1.1 --- /dev/null Mon Jan 4 09:06:35 2010 +++ packages/sosreport/py-compiled.patch Mon Jan 4 09:06:29 2010 @@ -0,0 +1,13 @@ +--- sos-1.8/sosreport~ 2010-01-04 00:22:41.000000000 +0200 ++++ sos-1.8/sosreport 2010-01-04 00:26:18.466651458 +0200 +@@ -449,8 +449,8 @@ + + # validate and load plugins + for plug in plugins: +- plugbase = plug[:-3] +- if not plug[-3:] == '.py' or plugbase == "__init__": ++ plugbase = plug[:-4] ++ if not plug[-4:] == '.pyc' or plugbase == "__init__": + continue + try: + if policy.validatePlugin(pluginpath + plug): ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sosreport/sosreport.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
