From 0929c9bdf3dfa6edbf0505f1075b3c9c9274057c Mon Sep 17 00:00:00 2001 From: Till Hofmann Date: Feb 14 2020 09:14:30 +0000 Subject: templates: also explicitly obsolete ros-kinetic packages --- diff --git a/templates/pkg.spec.j2 b/templates/pkg.spec.j2 index 04731a4..c395387 100644 --- a/templates/pkg.spec.j2 +++ b/templates/pkg.spec.j2 @@ -52,6 +52,7 @@ Requires: ros-{{ distro }}-{{ dep }} Provides: ros-{{ distro }}-{{ pkg_name }} = {{ pkg_version }}-{{ pkg_release }} {% if obsolete_distro_pkg %} Obsoletes: ros-{{ distro }}-{{ pkg_name }} < {{ pkg_version }}-{{ pkg_release }} +Obsoletes: ros-kinetic-{{ pkg_name }} {% endif %} {% if not has_devel %} @@ -95,6 +96,7 @@ Requires: ros-{{ distro }}-{{ dep }}-devel Provides: ros-{{ distro }}-{{ pkg_name }}-devel = {{ pkg_version }}-{{ pkg_release }} {% if obsolete_distro_pkg %} Obsoletes: ros-{{ distro }}-{{ pkg_name }}-devel < {{ pkg_version }}-{{ pkg_release }} +Obsoletes: ros-kinetic-{{ pkg_name }}-devel {% endif %} %description devel