From 2088daa2ccb15f38af14085786a7df88b09032bb Mon Sep 17 00:00:00 2001 From: maminjie Date: Tue, 5 Jan 2021 10:13:20 +0800 Subject: [PATCH] resolve installation conflicts of sub-packages and fix license --- sip.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sip.spec b/sip.spec index 26a2d6c..1a519d0 100644 --- a/sip.spec +++ b/sip.spec @@ -8,9 +8,10 @@ Name: sip Version: 4.19.12 -Release: 11 +Release: 12 Summary: A C/C++ library bindings generator for Python v2 and v3 -License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) +# sipgen/parser.{c.h} is GPLv2 with exceptions (bison) +License: GPLv2 and (GPLv2 with exceptions) or GPLv3 URL: http://www.riverbankcomputing.com/software/sip/intro Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}.tar.gz Source1: macros.sip @@ -145,17 +146,17 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %doc NEWS README LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python3_sitearch}/PyQt4/sip.* %{python3_sitearch}/PyQt4_sip-%{version}.dist-info/ -%{python3_sitearch}/__pycache__/* -%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %files -n python3-pyqt5-sip %doc NEWS README LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python3_sitearch}/PyQt5/sip.* %{python3_sitearch}/PyQt5_sip-%{version}.dist-info/ -%{python3_sitearch}/__pycache__/* -%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %changelog +* Tue Jan 05 2021 maminjie - 4.19.12-12 +- resolve installation conflicts of sub-packages +- fix license + * Wed Oct 21 2020 wutao - 4.19.12-11 - delete python2 modules -- Gitee