From 884ac6d2142a98e82d24d41bbcbd9140951cd0e0 Mon Sep 17 00:00:00 2001 From: Sarantis Paskalis Date: Mar 24 2006 10:05:09 +0000 Subject: auto-import python-simpy-1.7-1 on branch devel from python-simpy-1.7-1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 4d51faa..32e5bb1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -SimPy-1.6.1.tar.gz +SimPy-1.7final.tar.gz diff --git a/python-simpy-1.6.1-no-shebang.patch b/python-simpy-1.6.1-no-shebang.patch deleted file mode 100644 index 0117cdd..0000000 --- a/python-simpy-1.6.1-no-shebang.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -urN SimPy-orig/__init__.py SimPy/__init__.py ---- SimPy-orig/__init__.py 2005-11-16 12:55:29.000000000 +0200 -+++ SimPy/__init__.py 2005-11-25 15:38:44.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """ SimPy a process-based simulation package in Python - - LICENSE: -diff -urN SimPy-orig/Lister.py SimPy/Lister.py ---- SimPy-orig/Lister.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/Lister.py 2005-11-25 15:39:07.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """Lister 1.6.1 - Pretty-printer for SimPy class objects - '$Revision: 1.1 $ $Date: 2005/12/22 20:27:20 $ kgm' -diff -urN SimPy-orig/Monitor.py SimPy/Monitor.py ---- SimPy-orig/Monitor.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/Monitor.py 2005-11-25 15:39:16.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """Monitor 1.6.1 - '$Revision: 1.1 $ $Date: 2005/12/22 20:27:20 $ kgm' - This dummy module is only provided for backward compatibility. -diff -urN SimPy-orig/MonitorTest.py SimPy/MonitorTest.py ---- SimPy-orig/MonitorTest.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/MonitorTest.py 2005-11-25 15:39:26.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """ - Testing Monitor, Tally. - This may be included in SimPyTest eventually. -diff -urN SimPy-orig/SimGUI.py SimPy/SimGUI.py ---- SimPy-orig/SimGUI.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/SimGUI.py 2005-11-25 15:39:43.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """SimGUI 1.6.1 - __version__ = '$Revision: 1.1 $ $Date: 2005/12/22 20:27:20 $ kgm' - -diff -urN SimPy-orig/SimPlot.py SimPy/SimPlot.py ---- SimPy-orig/SimPlot.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/SimPlot.py 2005-11-25 15:39:49.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """ SimPlot 1.6.1 - - $Revision: 1.1 $ $Date: 2005/12/22 20:27:20 $ kgm -diff -urN SimPy-orig/Simulation.py SimPy/Simulation.py ---- SimPy-orig/Simulation.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/Simulation.py 2005-11-25 15:39:56.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """Simulation 1.6.1 - __version__ = '$Revision: 1.1 $ $Date: 2005/12/22 20:27:20 $ kgm' - LICENSE: -diff -urN SimPy-orig/SimulationRT.py SimPy/SimulationRT.py ---- SimPy-orig/SimulationRT.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/SimulationRT.py 2005-11-25 15:40:03.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """SimulationRT 1.6.1 - __version__ = '$Revision: 1.1 $ $Date: 2005/12/22 20:27:20 $ kgm' - LICENSE: -diff -urN SimPy-orig/SimulationStep.py SimPy/SimulationStep.py ---- SimPy-orig/SimulationStep.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/SimulationStep.py 2005-11-25 15:40:10.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """SimulationStep 1.6.1 - __version__ = '$Revision: 1.1 $ $Date: 2005/12/22 20:27:20 $ kgm' - LICENSE: -diff -urN SimPy-orig/SimulationTrace.py SimPy/SimulationTrace.py ---- SimPy-orig/SimulationTrace.py 2005-11-16 12:55:28.000000000 +0200 -+++ SimPy/SimulationTrace.py 2005-11-25 15:40:17.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """SimulationTrace 1.6.1 - __version__ = '$Revision: 1.1 $ $Date: 2005/12/22 20:27:20 $ kgm' - LICENSE: -diff -urN SimPy-orig/testSimPy.py SimPy/testSimPy.py ---- SimPy-orig/testSimPy.py 2005-11-16 12:55:29.000000000 +0200 -+++ SimPy/testSimPy.py 2005-11-25 15:40:33.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # testSimPy.py test routines - # $Author: sarantis $ $Revision: 1.1 $ - # $Date: 2005/12/22 20:27:20 $ -diff -urN SimPy-orig/testSimPyRT.py SimPy/testSimPyRT.py ---- SimPy-orig/testSimPyRT.py 2005-11-16 12:55:29.000000000 +0200 -+++ SimPy/testSimPyRT.py 2005-11-25 15:40:43.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # testSimPyRT.py test routines - #Based on testSimpy.py to test full compatibility - #between Simulation and SimulationRT -diff -urN SimPy-orig/testSimPyStep.py SimPy/testSimPyStep.py ---- SimPy-orig/testSimPyStep.py 2005-11-16 12:55:29.000000000 +0200 -+++ SimPy/testSimPyStep.py 2005-11-25 15:40:53.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # testSimPyStep.py test routines - # $Author: sarantis $ $Revision: 1.1 $ - # $Date: 2005/12/22 20:27:20 $ -diff -urN SimPy-orig/testSimPyTrace.py SimPy/testSimPyTrace.py ---- SimPy-orig/testSimPyTrace.py 2005-11-16 12:55:29.000000000 +0200 -+++ SimPy/testSimPyTrace.py 2005-11-25 15:41:28.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # testSimPyTrace.py test routines - # $Author: sarantis $ $Revision: 1.1 $ - # $Date: 2005/12/22 20:27:20 $ diff --git a/python-simpy.spec b/python-simpy.spec index d4335fa..3452c5c 100644 --- a/python-simpy.spec +++ b/python-simpy.spec @@ -2,14 +2,13 @@ %define pkgname SimPy Name: python-simpy -Version: 1.6.1 -Release: 4%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL URL: http://simpy.sourceforge.net -Source0: http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz -Patch1: python-simpy-1.6.1-no-shebang.patch +Source0: http://dl.sf.net/simpy/SimPy-%{version}final.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -39,8 +38,8 @@ package contains the source code documentation. %prep %setup -q -n %{pkgname}-%{version} -%patch1 - +# Remove the shebangs to make rpmlint happy +%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py %build %{__python} setup.py build @@ -58,7 +57,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) # choose html over txt files for documentation -%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css +%doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %dir %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}/*.py %{python_sitelib}/%{pkgname}/*.pyc @@ -71,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 +- SimPy-1.7 +- Drop shebang removal patch. Implement it with sed script. + * Mon Feb 20 2006 Sarantis Paskalis - 1.6.1-4 - Rebuild for FC5. diff --git a/sources b/sources index 83dfcca..c36e0e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6de42d6289bee6d767d07f8839f89d07 SimPy-1.6.1.tar.gz +0bf0102e7976b3f40e52fc43f93751ad SimPy-1.7final.tar.gz