From 1ee5433ac06e1141373acf6661ac13beaaeecc33 Mon Sep 17 00:00:00 2001 From: alexlan Date: Dec 14 2007 04:56:05 +0000 Subject: - Include eggs in file list for F9+ - Actually remove unneeded patch from CVS. --- diff --git a/biopython-setup_test.patch b/biopython-setup_test.patch deleted file mode 100644 index 04f0489..0000000 --- a/biopython-setup_test.patch +++ /dev/null @@ -1,65 +0,0 @@ -Index: setup.py -=================================================================== -RCS file: /home/repository/biopython/biopython/setup.py,v -retrieving revision 1.116 -diff -u -p -r1.116 setup.py ---- setup.py 17 Mar 2007 19:21:04 -0000 1.116 -+++ setup.py 11 Apr 2007 03:37:48 -0000 -@@ -238,11 +238,18 @@ class test_biopython(Command): - - """ - description = "Automatically run the test suite for Biopython." -- user_options = [] # distutils complains if this is not here. -- def initialize_options(self): # distutils wants this -- pass -- def finalize_options(self): # this too -+ -+ user_options = [ -+ # provide the option to run tests in no-gui mode -+ ('no-gui', None, "Do not run in GUI mode") -+ ] -+ -+ def initialize_options(self): -+ self.no_gui = None -+ -+ def finalize_options(self): - pass -+ - def run(self): - this_dir = os.getcwd() - -@@ -250,7 +257,10 @@ class test_biopython(Command): - os.chdir("Tests") - sys.path.insert(0, '') - import run_tests -- run_tests.main([]) -+ if self.no_gui: -+ run_tests.main(['--no-gui']) -+ else: -+ run_tests.main([]) - - # change back to the current directory - os.chdir(this_dir) -Index: Tests/run_tests.py -=================================================================== -RCS file: /home/repository/biopython/biopython/Tests/run_tests.py,v -retrieving revision 1.8 -diff -u -p -r1.8 run_tests.py ---- Tests/run_tests.py 9 Mar 2007 23:36:43 -0000 1.8 -+++ Tests/run_tests.py 11 Apr 2007 03:37:48 -0000 -@@ -56,7 +56,7 @@ def main(argv): - - # get the command line options - try: -- opts, args = getopt.getopt(argv[1:], 'g', -+ opts, args = getopt.getopt(argv, 'g', - ["generate", "no-gui", "help"]) - except getopt.error, msg: - print msg -@@ -316,5 +316,5 @@ def convert_string_newlines(line): - return line - - if __name__ == "__main__": -- sys.exit(main(sys.argv)) -+ sys.exit(main(sys.argv[1:])) - diff --git a/python-biopython.spec b/python-biopython.spec index cd6dbfa..b1a13c1 100644 --- a/python-biopython.spec +++ b/python-biopython.spec @@ -3,7 +3,7 @@ Name: python-biopython Version: 1.44 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python tools for computational molecular biology Source0: http://biopython.org/DIST/biopython-%{version}.tar.gz License: MIT @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc Doc Scripts %doc CONTRIB DEPRECATED LICENSE NEWS README +%if 0%{?fedora} >= 9 +%{python_sitearch}/*egg-info +%endif %dir %{python_sitearch}/Bio %{python_sitearch}/Bio/* %dir %{python_sitearch}/Martel @@ -71,27 +74,30 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/BioSQL/* %changelog -* Sun Oct 28 2007 Alex Lancaster 1.44-2 +* Thu Dec 13 2007 Alex Lancaster 1.44-3 +- Include eggs in file list for F9+ + +* Sun Oct 28 2007 Alex Lancaster 1.44-2 - Drop patch to setup.py, applied upstream -* Sun Oct 28 2007 Alex Lancaster 1.44-1 +* Sun Oct 28 2007 Alex Lancaster 1.44-1 - Update to latest upstream (1.44). -* Mon Aug 27 2007 Alex Lancaster 1.43-5 +* Mon Aug 27 2007 Alex Lancaster 1.43-5 - Used "MIT" as short license name as the "Biopython License Agreement" is the same as the CMU MIT variant. -* Mon Apr 25 2007 Alex Lancaster 1.43-4 +* Mon Apr 25 2007 Alex Lancaster 1.43-4 - Add wise2 Requires since the Wise biopython module uses the command-line behind-the-scenes. -* Mon Apr 17 2007 Alex Lancaster 1.43-3 +* Mon Apr 17 2007 Alex Lancaster 1.43-3 - Use python_sitearch macro to enable x86_64 builds work. -* Mon Apr 16 2007 Alex Lancaster 1.43-2 +* Mon Apr 16 2007 Alex Lancaster 1.43-2 - Fix Source0 URL as per suggestion from Parag AN on #235989. -* Mon Apr 02 2007 Alex Lancaster 1.43-1 +* Mon Apr 02 2007 Alex Lancaster 1.43-1 - Initial Fedora package.