From 99f69261565c0d3605747b11d00832bbde2f639f Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 31 Jan 2017 00:54:56 +0100
Subject: [PATCH] don't try to group requires/conflicts

We can't reliably get mappings between requires and conflicts, so
just split the out to not confuse people.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 rust2rpm.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/rust2rpm.py b/rust2rpm.py
index de772a0..042071d 100644
--- a/rust2rpm.py
+++ b/rust2rpm.py
@@ -1,5 +1,4 @@
 import argparse
-import itertools
 import os
 import tarfile
 import tempfile
@@ -28,11 +27,11 @@ ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust
 BuildRequires:  cargo
-{% for br, bc in zip(buildrequires, buildconflicts) %}
+{% for br in buildrequires %}
 BuildRequires:  {{ br }}
-{% if bc is not none %}
+{% endfor %}
+{% for bc in buildconflicts %}
 BuildConflicts: {{ bc }}
-{% endif %}
 {% endfor %}
 
 %description
@@ -44,11 +43,11 @@ BuildArch:      noarch
 {% for prov in provides %}
 Provides:       {{ prov }}
 {% endfor %}
-{% for req, con in zip(requires, conflicts) %}
+{% for req in requires %}
 Requires:       {{ req }}
-{% if con is not none %}
+{% endfor %}
+{% for con in conflicts %}
 Conflicts:      {{ con }}
-{% endif %}
 {% endfor %}
 
 %description    devel
@@ -72,7 +71,6 @@ Conflicts:      {{ con }}
 """
 JINJA_ENV = jinja2.Environment(undefined=jinja2.StrictUndefined,
                                trim_blocks=True, lstrip_blocks=True)
-JINJA_ENV.globals.update(zip=itertools.zip_longest)
 
 
 def run_depgen(*params):