$ git show --format=fuller --patch-with-stat --summary f39beb7446fc771aa1f70646d4d924013db40235
commit f39beb7446fc771aa1f70646d4d924013db40235
Author: Colin <itchka@compuserve.com>
AuthorDate: Thu Dec 31 11:38:46 2020 +0000
Commit: Colin <itchka@compuserve.com>
CommitDate: Thu Dec 31 11:38:46 2020 +0000
Fix up duplicates in spec template
---
add-openmandriva-spec-template.patch | 16 ++++------------
pyp2rpm.spec | 2 +-
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/add-openmandriva-spec-template.patch b/add-openmandriva-spec-template.patch
index 3efd5c7..7a433c5 100644
--- a/add-openmandriva-spec-template.patch
+++ b/add-openmandriva-spec-template.patch
@@ -1,9 +1,9 @@
diff --git a/pyp2rpm/templates/openmandriva.spec b/pyp2rpm/templates/openmandriva.spec
new file mode 100644
-index 0000000..9f84030
+index 0000000..963f90d
--- /dev/null
+++ b/pyp2rpm/templates/openmandriva.spec
-@@ -0,0 +1,126 @@
+@@ -0,0 +1,118 @@
+{{ data.credit_line }}
+{% from 'macros.spec' import dependencies, for_python_versions, underscored_or_pypi -%}
+%global pypi_name {{ data.name }}
@@ -29,18 +29,10 @@ index 0000000..9f84030
+
+%description
+{{ data.description|truncate(400)|wordwrap }}
-+{% for pv in data.sorted_python_versions %}
-+%package -n {{data.pkg_name|macroed_pkg_name(data.srcname)|name_for_python_version(None, True) }}
-+Summary: %{summary}
-+%{?python_provide:%python_provide {{data.pkg_name|macroed_pkg_name(data.srcname)|name_for_python_version(None, True)}}}
-+{{ dependencies(data.runtime_deps, True, pv, pv) }}
-+%description -n {{data.pkg_name|macroed_pkg_name(data.srcname)|name_for_python_version(None, True) }}
-+{{ data.description|truncate(400)|wordwrap }}
-+{% endfor -%}
+{%- if data.sphinx_dir %}
-+%package -n {{ data.pkg_name|macroed_pkg_name(data.srcname)|name_for_python_version(None, True) }}-doc
++%package -n {{ data.pkg_name|macroed_pkg_name(data.srcname)|name_for_python_version(None, True ) }}-doc
+Summary: {{ data.name }} documentation
-+%description -n {{ data.pkg_name|macroed_pkg_name(data.srcname)|name_for_python_version(None, True) }}-doc
++%description -n {{ data.pkg_name|macroed_pkg_name(data.srcname)|name_for_python_version(None, True ) }}-doc
+Documentation for {{ data.name }}
+{%- endif %}
+
diff --git a/pyp2rpm.spec b/pyp2rpm.spec
index 9d7c8c3..20c9c46 100644
--- a/pyp2rpm.spec
+++ b/pyp2rpm.spec
@@ -2,7 +2,7 @@
Name: pyp2rpm
Version: 3.3.5
-Release: 5
+Release: 6
Group: Development/Python
Summary: Convert Python packages to RPM SPECFILES