On 11/09/2015 01:10 PM, Jan Cholasta wrote:
> Hi,
>
> On 9.11.2015 12:58, Tomas Babej wrote:
>> Hi,
>>
>> this fixes:
>>
>> https://fedorahosted.org/freeipa/ticket/5408
>
> a) Don't include %{release} in the Provides, release number is
> meaningless between distros.
>
Good point.
> b) Please put the Provides near the related Conflicts and Obsoletes,
> like this:
>
> Provides: %{alt_name}-XXX = %{version}
> Conflicts: %{alt_name}-XXX
> Obsoletes: %{alt_name}-XXX < %{version}
>
> Honza
>
Updated version attached.
From c95f9383fcb428a2a21838dcb4940f974e4c57dd Mon Sep 17 00:00:00 2001
From: Tomas Babej <tba...@redhat.com>
Date: Mon, 9 Nov 2015 12:15:59 +0100
Subject: [PATCH] spec: Add Provides directives to alternative package names
https://fedorahosted.org/freeipa/ticket/5408
---
freeipa.spec.in | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 913f03926ef3d2bcdcfc51a6036f7c076a7fb7ef..c3ca3413ffc3850b849a69adbbae8476355f3c76 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -162,6 +162,7 @@ Requires: gzip
Requires: python-gssapi >= 1.1.0
Requires: custodia
+Provides: %{alt_name}-server = %{version}
Conflicts: %{alt_name}-server
Obsoletes: %{alt_name}-server < %{version}
@@ -203,6 +204,7 @@ Requires: bind-pkcs11-utils >= 9.9.4-21
%endif
Requires: opendnssec >= 1.4.6-4
+Provides: %{alt_name}-server-dns = %{version}
Conflicts: %{alt_name}-server-dns
Obsoletes: %{alt_name}-server-dns < %{version}
@@ -234,6 +236,7 @@ Requires(post): python
Requires(postun): %{_sbindir}/update-alternatives
Requires(preun): %{_sbindir}/update-alternatives
+Provides: %{alt_name}-server-trust-ad = %{version}
Conflicts: %{alt_name}-server-trust-ad
Obsoletes: %{alt_name}-server-trust-ad < %{version}
@@ -272,6 +275,7 @@ Requires: libnfsidmap
Requires: nfs-utils
Requires(post): policycoreutils
+Provides: %{alt_name}-client = %{version}
Conflicts: %{alt_name}-client
Obsoletes: %{alt_name}-client < %{version}
@@ -292,6 +296,7 @@ Requires: %{name}-python = %{version}-%{release}
Requires: %{name}-client = %{version}-%{release}
Requires: python-ldap
+Provides: %{alt_name}-admintools = %{version}
Conflicts: %{alt_name}-admintools
Obsoletes: %{alt_name}-admintools < %{version}
@@ -327,6 +332,7 @@ Requires: python-setuptools
Requires: python-six
Requires: python-jwcrypto
+Provides: %{alt_name}-python = %{version}
Conflicts: %{alt_name}-python
Obsoletes: %{alt_name}-python < %{version}
@@ -353,6 +359,7 @@ Requires: python-polib
Requires: python-pytest-multihost >= 0.5
Requires: python-pytest-sourceorder
+Provides: %{alt_name}-tests = %{version}
Conflicts: %{alt_name}-tests
Obsoletes: %{alt_name}-tests < %{version}
--
2.4.3
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
