From da08697551b8cd5eabaff1bd27e69cd074849179 Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Thu, 12 Dec 2024 00:34:17 -0800 Subject: [PATCH] Fix patch context Allow patch to apply to latest IMP without fuzz, so that RPM builds succeed. --- tools/rpm/imp-no-cnmultifit.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/rpm/imp-no-cnmultifit.patch b/tools/rpm/imp-no-cnmultifit.patch index 79033c5e7c..477d4b4995 100644 --- a/tools/rpm/imp-no-cnmultifit.patch +++ b/tools/rpm/imp-no-cnmultifit.patch @@ -1,8 +1,8 @@ diff --git a/tools/nightly-tests/test-install/test.py b/tools/nightly-tests/test-install/test.py -index ad2ac77bc0..79725c03a8 100644 +index eeb708ce57..55290327de 100644 --- a/tools/nightly-tests/test-install/test.py +++ b/tools/nightly-tests/test-install/test.py -@@ -70,7 +70,7 @@ class IMPInstallTests(unittest.TestCase): +@@ -71,7 +71,7 @@ class IMPInstallTests(unittest.TestCase): def test_applications_installed(self): """Check install of basic applications""" @@ -12,18 +12,18 @@ index ad2ac77bc0..79725c03a8 100644 App('pdb_check'), App('pdb_rmf'), App('rmf_cat', can_exit_1=True), diff --git a/tools/nightly-tests/test-install/test_mock.py b/tools/nightly-tests/test-install/test_mock.py -index 82162c8f18..83f9102f34 100644 +index f80ec7b3bd..91df8bfe9d 100644 --- a/tools/nightly-tests/test-install/test_mock.py +++ b/tools/nightly-tests/test-install/test_mock.py -@@ -35,7 +35,6 @@ class IMPMockTests(unittest.TestCase): - _ = IMP.npctransport.Configuration +@@ -23,7 +23,6 @@ class IMPMockTests(unittest.TestCase): + _ = IMP.npctransport.Configuration # Check that most other modules (particularly those with many # dependencies) are present - import IMP.cnmultifit import IMP.domino import IMP.em import IMP.gsl -@@ -63,7 +62,7 @@ class IMPMockTests(unittest.TestCase): +@@ -51,7 +50,7 @@ class IMPMockTests(unittest.TestCase): 'interface_cross_links', 'em3d_score', 'em3d_single_score', 'saxs_score', 'interface_rtc', 'nmr_rtc_score', 'soap_score']