From 4f6635d3442cb7dae3dd44bb710b66146188144d90b28f89ef59205bf5d5ed56 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 20 Apr 2017 05:05:38 +0000 Subject: [PATCH 1/4] Accepting request 489477 from KDE:Qt Since qt5 is the main Qt platform, KDE:Qt5 should be the devel package for python-sip and KDE:Qt should link to the KDE:Qt5 version. OBS-URL: https://build.opensuse.org/request/show/489477 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=1 --- python-sip.changes | 9 --------- python-sip.spec | 2 +- sip-4.19.1.tar.gz | 3 +++ sip-4.19.2.tar.gz | 3 --- 4 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 sip-4.19.1.tar.gz delete mode 100644 sip-4.19.2.tar.gz diff --git a/python-sip.changes b/python-sip.changes index 82dfba5..675016e 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Sat Apr 8 13:52:52 UTC 2017 - hpj@urpla.net - -- Update to 4.19.2 - * siplib/siplib.c.in: Remove an unnecessary comment. - * siplib/siplib.c.in: - Fixed a crash when a user defined class uses sip.wrappertype as it's - meta-type but is not derived from sip.simplewrapper. - ------------------------------------------------------------------- Mon Apr 3 17:22:56 UTC 2017 - hpj@urpla.net diff --git a/python-sip.spec b/python-sip.spec index 66ca138..221c399 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -20,7 +20,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-sip -Version: 4.19.2 +Version: 4.19.1 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0 or GPL-3.0 or SUSE-SIP diff --git a/sip-4.19.1.tar.gz b/sip-4.19.1.tar.gz new file mode 100644 index 0000000..aa5669f --- /dev/null +++ b/sip-4.19.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e +size 1000644 diff --git a/sip-4.19.2.tar.gz b/sip-4.19.2.tar.gz deleted file mode 100644 index 626ac8e..0000000 --- a/sip-4.19.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533 -size 1000746 From 75fd2904c61cafd186d145ee1f63b576c0c1384ec65bb166b292e2b519673c3d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 16 May 2017 08:48:42 +0000 Subject: [PATCH 2/4] Accepting request 495124 from home:TheBlackCat:branches:KDE:Qt5 Provide a basic api version macro OBS-URL: https://build.opensuse.org/request/show/495124 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=3 --- python-sip.changes | 5 +++++ python-sip.spec | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/python-sip.changes b/python-sip.changes index 675016e..78c9cba 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 15 22:33:42 UTC 2017 - toddrme2178@gmail.com + +- Provide a basic api version macro + ------------------------------------------------------------------- Mon Apr 3 17:22:56 UTC 2017 - hpj@urpla.net diff --git a/python-sip.spec b/python-sip.spec index 221c399..afccfcf 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -49,6 +49,7 @@ for any C or C++ library. Summary: SIP tool to create python bindings Group: Development/Libraries/Python Requires: %{name} = %{version} +Requires: %{name}-common = %{version} Requires: c++_compiler Requires: python-devel Provides: %{name}-bin = %{version} @@ -142,15 +143,17 @@ mv %{buildroot}%{_bindir}/sip %{buildroot}%{_bindir}/sip-%{$python_bin_suffix} mkdir -p %{buildroot}/%{_sysconfdir}/rpm/ +echo "%%python_sip_api_ver %{python_sip_api}" > %{buildroot}/%{_sysconfdir}/rpm/macros.python_all-sip + %if 0%{have_python2} -echo "%%requires_python2_sip_api Requires: %{python2_prefix}-sip(api) = %{python_sip_api}" > %{buildroot}/%{_sysconfdir}/rpm/macros.%{python2_prefix}-sip -echo "%%requires_python_sip_api Requires: %{python2_prefix}-sip(api) = %{python_sip_api}" >> %{buildroot}/%{_sysconfdir}/rpm/macros.%{python2_prefix}-sip +echo "%%requires_python2_sip_api Requires: %{python2_prefix}-sip(api) = %%python_sip_api_ver" > %{buildroot}/%{_sysconfdir}/rpm/macros.%{python2_prefix}-sip +echo "%%requires_python_sip_api Requires: %{python2_prefix}-sip(api) = %%python_sip_api_ver" >> %{buildroot}/%{_sysconfdir}/rpm/macros.%{python2_prefix}-sip %py_compile %{buildroot}%{python2_sitearch} %endif %if 0%{have_python3} -echo "%%requires_python3_sip_api Requires: %{python3_prefix}-sip(api) = %{python_sip_api}" > %{buildroot}/%{_sysconfdir}/rpm/macros.%{python3_prefix}-sip +echo "%%requires_python3_sip_api Requires: %{python3_prefix}-sip(api) = %%python_sip_api_ver" > %{buildroot}/%{_sysconfdir}/rpm/macros.%{python3_prefix}-sip %py3_compile %{buildroot}%{python3_sitearch} %endif @@ -190,6 +193,7 @@ mkdir -p %{buildroot}%{_datadir}/sip %files -n python-sip-common %defattr(-,root,root,-) %doc LICENSE* +%config %{_sysconfdir}/rpm/macros.python_all-sip %{_datadir}/sip/ %changelog From 7e5550cd56d20b9c7a7fc6547f7a6a69eaea720960292a6532c6400a0bac738f Mon Sep 17 00:00:00 2001 From: Todd R Date: Tue, 16 May 2017 14:26:33 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=6 --- python-sip.changes | 8 ++++++-- python-sip.spec | 2 +- sip-4.19.1.tar.gz | 3 --- sip-4.19.2.tar.gz | 3 +++ 4 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 sip-4.19.1.tar.gz create mode 100644 sip-4.19.2.tar.gz diff --git a/python-sip.changes b/python-sip.changes index 78c9cba..82dfba5 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,7 +1,11 @@ ------------------------------------------------------------------- -Mon May 15 22:33:42 UTC 2017 - toddrme2178@gmail.com +Sat Apr 8 13:52:52 UTC 2017 - hpj@urpla.net -- Provide a basic api version macro +- Update to 4.19.2 + * siplib/siplib.c.in: Remove an unnecessary comment. + * siplib/siplib.c.in: + Fixed a crash when a user defined class uses sip.wrappertype as it's + meta-type but is not derived from sip.simplewrapper. ------------------------------------------------------------------- Mon Apr 3 17:22:56 UTC 2017 - hpj@urpla.net diff --git a/python-sip.spec b/python-sip.spec index afccfcf..bc9ddaa 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -20,7 +20,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-sip -Version: 4.19.1 +Version: 4.19.2 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0 or GPL-3.0 or SUSE-SIP diff --git a/sip-4.19.1.tar.gz b/sip-4.19.1.tar.gz deleted file mode 100644 index aa5669f..0000000 --- a/sip-4.19.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e -size 1000644 diff --git a/sip-4.19.2.tar.gz b/sip-4.19.2.tar.gz new file mode 100644 index 0000000..626ac8e --- /dev/null +++ b/sip-4.19.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533 +size 1000746 From 1f7bb47d2774baadd33a5fc08e7ea1f494b493b438b665122db86b86d7812c29 Mon Sep 17 00:00:00 2001 From: Todd R Date: Tue, 16 May 2017 14:28:46 +0000 Subject: [PATCH 4/4] Accepting request 495364 from home:TheBlackCat:branches:KDE:Qt5 Fix .changes file conflict (hopefully) OBS-URL: https://build.opensuse.org/request/show/495364 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=9 --- python-sip.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-sip.changes b/python-sip.changes index 82dfba5..298d2b8 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 15 22:33:42 UTC 2017 - toddrme2178@gmail.com + +- Provide a basic api version macro + ------------------------------------------------------------------- Sat Apr 8 13:52:52 UTC 2017 - hpj@urpla.net