From 32eb244452c0896c0adfa98209492bc55637c7764666368abedaa00a7c5a46e7 Mon Sep 17 00:00:00 2001 From: Mikhail Terekhov Date: Sat, 11 Oct 2014 17:22:59 +0000 Subject: [PATCH] Accepting request 255088 from home:termim:branches:KDE:Qt update to 4.16.3 OBS-URL: https://build.opensuse.org/request/show/255088 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=124 --- python-sip.changes | 8 ++++++++ python-sip.spec | 17 ++++++++--------- python3-sip.changes | 8 ++++++++ python3-sip.spec | 23 +++++++++++------------ sip-4.16.2.tar.gz | 3 --- sip-4.16.3.tar.gz | 3 +++ 6 files changed, 38 insertions(+), 24 deletions(-) delete mode 100644 sip-4.16.2.tar.gz create mode 100644 sip-4.16.3.tar.gz diff --git a/python-sip.changes b/python-sip.changes index 01f29eb..05e0588 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Oct 11 17:01:01 UTC 2014 - termim@gmail.com + +- Update to 4.16.3 + - This is a minor functional release including the implementation of + __qualname__ for class enums. + - run spec-cleaner + ------------------------------------------------------------------- Thu Jul 31 08:45:44 UTC 2014 - toddrme2178@gmail.com diff --git a/python-sip.spec b/python-sip.spec index 27ea1bb..b6aac2b 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -17,9 +17,8 @@ %define python_sip_api 11.1 - Name: python-sip -Version: 4.16.2 +Version: 4.16.3 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0 or GPL-3.0 or SUSE-SIP @@ -33,7 +32,7 @@ Patch1: build-compare.diff BuildRequires: c++_compiler BuildRequires: python BuildRequires: python-devel -Provides: python-sip(api) = %python_sip_api +Provides: python-sip(api) = %{python_sip_api} BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires @@ -49,7 +48,7 @@ Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: c++_compiler Requires: python-devel -Requires(post): update-alternatives +Requires(post): update-alternatives Provides: python-sip-bin = %{version} Obsoletes: python-sip-bin < %{version} @@ -77,15 +76,15 @@ make %{?_smp_mflags} sip_major=$(grep "define SIP_API_MAJOR_NR" siplib/sip.h.in | awk '{print $3}') sip_minor=$(grep "define SIP_API_MINOR_NR" siplib/sip.h.in | awk '{print $3}') -if test "%python_sip_api" != "$sip_major.$sip_minor"; then +if test "%{python_sip_api}" != "$sip_major.$sip_minor"; then echo "API version was changed to $sip_major.$sip_minor" exit 1 fi -echo "%%requires_python_sip_api Requires: python-sip(api) = $sip_major.$sip_minor" > macros.%name +echo "%%requires_python_sip_api Requires: python-sip(api) = $sip_major.$sip_minor" > macros.%{name} %install -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install %{?_smp_mflags} mkdir -p %{buildroot}%{_datadir}/sip # For alternatives @@ -94,7 +93,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/sip ln -s -f %{_sysconfdir}/alternatives/sip %{buildroot}/%{_bindir}/sip -install -m 644 -D macros.%name %{buildroot}/%{_sysconfdir}/rpm/macros.%name +install -m 644 -D macros.%{name} %{buildroot}/%{_sysconfdir}/rpm/macros.%{name} # Point to the correct location for the documentation files sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README @@ -116,7 +115,7 @@ fi %files devel %defattr(-,root,root,-) %doc NEWS LICENSE* doc/ -%config %{_sysconfdir}/rpm/macros.%name +%config %{_sysconfdir}/rpm/macros.%{name} %{_bindir}/sip-%{py_ver} %ghost %{_sysconfdir}/alternatives/sip %{_bindir}/sip diff --git a/python3-sip.changes b/python3-sip.changes index 5582fc2..2655883 100644 --- a/python3-sip.changes +++ b/python3-sip.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Oct 11 17:01:01 UTC 2014 - termim@gmail.com + +- Update to 4.16.3 + - This is a minor functional release including the implementation of + __qualname__ for class enums. + - run spec-cleaner + ------------------------------------------------------------------- Thu Jul 31 08:45:26 UTC 2014 - toddrme2178@gmail.com diff --git a/python3-sip.spec b/python3-sip.spec index 5c0e920..8ad4468 100644 --- a/python3-sip.spec +++ b/python3-sip.spec @@ -17,9 +17,11 @@ %define python_sip_api 11.1 - +%if 0%{?suse_version} == 1220 +%define py3_incdir %{_includedir}/python3.2mu +%endif Name: python3-sip -Version: 4.16.2 +Version: 4.16.3 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0 or GPL-3.0 or SUSE-SIP @@ -32,13 +34,10 @@ Patch0: disable-rpaths.diff Patch1: build-compare.diff BuildRequires: c++_compiler BuildRequires: python3-devel -Provides: python3-sip(api) = %python_sip_api Requires(pre): python3 Requires(pre): python3-base +Provides: python3-sip(api) = %{python_sip_api} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} == 1220 -%define py3_incdir %{_includedir}/python3.2mu -%endif %description SIP is a tool that makes it very easy to create Python bindings for C @@ -52,7 +51,7 @@ Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: c++_compiler Requires: python3-devel -Requires(post): update-alternatives +Requires(post): update-alternatives Provides: python3-sip-bin = %{version} Obsoletes: python3-sip-bin < %{version} @@ -80,15 +79,15 @@ make %{?_smp_mflags} sip_major=$(grep "define SIP_API_MAJOR_NR" siplib/sip.h.in | awk '{print $3}') sip_minor=$(grep "define SIP_API_MINOR_NR" siplib/sip.h.in | awk '{print $3}') -if test "%python_sip_api" != "$sip_major.$sip_minor"; then +if test "%{python_sip_api}" != "$sip_major.$sip_minor"; then echo "API version was changed to $sip_major.$sip_minor" exit 1 fi -echo "%%requires_python3_sip_api Requires: python3-sip(api) = $sip_major.$sip_minor" > macros.%name +echo "%%requires_python3_sip_api Requires: python3-sip(api) = $sip_major.$sip_minor" > macros.%{name} %install -%{make_install} +%make_install mkdir -p %{buildroot}%{_datadir}/sip # For alternatives @@ -100,7 +99,7 @@ ln -s -f %{_sysconfdir}/alternatives/sip %{buildroot}/%{_bindir}/sip # Point to the correct location for the documentation files sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README -install -m 644 -D macros.%name %{buildroot}/%{_sysconfdir}/rpm/macros.%name +install -m 644 -D macros.%{name} %{buildroot}/%{_sysconfdir}/rpm/macros.%{name} %post devel # Lower priority than the python 2.x version for now @@ -120,7 +119,7 @@ fi %files devel %defattr(-,root,root,-) %doc NEWS LICENSE* doc/ -%config %{_sysconfdir}/rpm/macros.%name +%config %{_sysconfdir}/rpm/macros.%{name} %{_bindir}/sip-%{py3_ver} %ghost %{_sysconfdir}/alternatives/sip %{_bindir}/sip diff --git a/sip-4.16.2.tar.gz b/sip-4.16.2.tar.gz deleted file mode 100644 index f1441a4..0000000 --- a/sip-4.16.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a55a2324a46ab42e42ae57c52ef06583b17d25c987973fe2e7ff2e8a649294ce -size 793663 diff --git a/sip-4.16.3.tar.gz b/sip-4.16.3.tar.gz new file mode 100644 index 0000000..be86747 --- /dev/null +++ b/sip-4.16.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd8a65693612f1d0c5dcd41881cd92496d770b3b9e03a138e533e3afc892f421 +size 794305