From b2d03ad90d074f7bd89a446b44a7f23ed8957ec2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Aug 26 2018 14:37:17 +0000 Subject: include sip-pyqt4/sip-pyqt5 wrappers --- diff --git a/sip-wrapper.sh b/sip-wrapper.sh new file mode 100644 index 0000000..d7d3751 --- /dev/null +++ b/sip-wrapper.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec sip -n @SIP_MODULE@ $@ diff --git a/sip.spec b/sip.spec index 1e62ad5..08b2f62 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 8%{?dist} +Release: 9%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -32,6 +32,8 @@ Source0: https://www.riverbankcomputing.com/static/Downloads/sip/sip-%{version} Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}.tar.gz %endif +Source10: sip-wrapper.sh + ## upstream patches ## upstreamable patches @@ -233,6 +235,12 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack %make_install -C %{_target_platform}-python2-pyqt4 %make_install -C %{_target_platform}-python2-pyqt5 +# sip-wrapper +install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt4 +install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt5 +sed -i -e 's|@SIP_MODULE@|PyQt4.sip|g' %{buildroot}%{_bindir}/sip-pyqt4 +sed -i -e 's|@SIP_MODULE@|PyQt5.sip|g' %{buildroot}%{_bindir}/sip-pyqt5 + mkdir -p %{buildroot}%{_datadir}/sip # Macros used by -devel subpackages: @@ -243,6 +251,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %doc README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{_bindir}/sip +# sip-wrappers +%{_bindir}/sip-pyqt4 +%{_bindir}/sip-pyqt5 # compat symlink %{_bindir}/python3-sip %dir %{_datadir}/sip/ @@ -307,6 +318,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sun Aug 26 2018 Rex Dieter - 4.19.12-9 +- include sip-pyqt4/sip-pyqt5 wrappers + * Fri Aug 24 2018 Rex Dieter - 4.19.12-8 - -devel: move sipconfig/sipdistutils here - -devel: drop dep on non-private base pkg (which may go away soon anyway)