From 84429a493a271cd497ad990c3ec78b0977d92a61 Mon Sep 17 00:00:00 2001 From: Adam Mercer Date: Fri, 21 Sep 2018 11:00:43 -0700 Subject: [PATCH] lalinference: fix upgrades from current release [ci skip] --- lalinference/debian/control.in | 4 ++-- lalinference/lalinference.spec.in | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lalinference/debian/control.in b/lalinference/debian/control.in index 3435c70910..03b52222b6 100644 --- a/lalinference/debian/control.in +++ b/lalinference/debian/control.in @@ -125,8 +125,8 @@ Depends: python-lalinspiral (>= @MIN_LALINSPIRAL_VERSION@~), python-lalpulsar (>= @MIN_LALPULSAR_VERSION@~), lalinference (= ${binary:Version}) -Replaces: lalapps (<< 6.14.0-1), lalinference-python (<< 1.9.4.1-1~) -Breaks: lalapps (<< 6.14.0-1), lalinference-python (<< 1.9.4.1-1~) +Replaces: lalapps (<< 6.21.0.1-1), lalinference-python (<< 1.9.4.1-1~) +Breaks: lalapps (<< 6.21.0.1-1), lalinference-python (<< 1.9.4.1-1~) Description: Python bindings for LALInference The LSC Algorithm Inference Library for gravitational wave data analysis. This package contains Python bindings for the LAL Inference library. diff --git a/lalinference/lalinference.spec.in b/lalinference/lalinference.spec.in index 54c45d767b..97faeb700a 100644 --- a/lalinference/lalinference.spec.in +++ b/lalinference/lalinference.spec.in @@ -90,9 +90,6 @@ library. %package -n python2-%{name} Summary: Python %{python2_version} Bindings for LALInference Group: LAL -Provides: %{name}-python -Obsoletes: %{name}-python < 1.9.4-2 -Conflicts: %{name}-python Requires: %{name} = %{version} Requires: healpy >= 1.9.1 Requires: h5py @@ -112,6 +109,8 @@ Requires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@ Requires: python2-lalburst >= @MIN_LALBURST_VERSION@ Requires: python2-lalinspiral >= @MIN_LALINSPIRAL_VERSION@ Requires: python2-lalpulsar >= @MIN_LALPULSAR_VERSION@ +Obsoletes: %{name}-python +Provides: %{name}-python %description -n python2-%{name} The LSC Algorithm Library for gravitational wave data analysis. This package provides the Python %{python2_version} bindings for LALInference. -- GitLab