Also split Conflict headers

openSUSE · Jan 28, 2021 · cba3c6c · cba3c6c
1 parent 636203c
commit cba3c6c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/prepare_spec b/prepare_spec
@@ -1062,7 +1062,7 @@ EOF
     my $value = $section->value();
 
     # support very special macros only
-    my %replacements = ('MACRO-VERSION' => '%{version}', 'MACRO-RELEASE' => '%{release}');
+    my %replacements = ('MACRO-VERSION' => '%{version}', 'MACRO-RELEASE' => '%{release}', 'MACRO-NAME' => '%{name}');
     for my $replacement (keys %replacements) {
       $value =~ s,\Q$replacements{$replacement}\E,$replacement,g;
     }
@@ -1148,7 +1148,7 @@ EOF
   sub reorder_tags {
     my $self = shift;
 
-    for my $tag (qw(BuildRequires Requires Provides Obsoletes Supplements Recommends PreReq)) {
+    for my $tag (qw(BuildRequires Requires Provides Obsoletes Supplements Recommends PreReq Conflicts)) {
       $self->reorder_tag($tag);
     }
   }

diff --git a/testing/conflicts.spec.out b/testing/conflicts.spec.out
@@ -16,13 +16,17 @@
 #
 
 
+Conflicts:      %{name} < %{version}-%{release}
+Conflicts:      %{name} > %{version}-%{release}
+Conflicts:      %{name}-fips < %{version}-%{release}
+Conflicts:      %{name}-fips > %{version}-%{release}
+Conflicts:      a
 Conflicts:      d
-Conflicts:      z a
-Conflicts:      openais <= 0.89, openais-devel <= 0.89
+Conflicts:      nonfreessh
+Conflicts:      openais <= 0.89
+Conflicts:      openais-devel <= 0.89
+Conflicts:      z
 Conflicts:      otherproviders(foo)
 Conflicts:      otherproviders(rust)
-Conflicts:      nonfreessh
-Conflicts:      %{name}-fips < %{version}-%{release} , %{name}-fips > %{version}-%{release}
-Conflicts:      %{name} < %{version}-%{release} , %{name} > %{version}-%{release}
 
 %changelog