pool/python-sip
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 199357 from home:saschpe:branches:KDE:Qt

Browse Source 
- Revert sr#79987, moving /usr/bin/sip into python-sip-bin and requiring
  that in python3-sip-devel (plus split provides) only causes trouble. It will
  make python3-sip-devel depend forever on Python2 for absolutely no reason.
  Both python-sip-devel and python3-sip-devel can happily provide /usr/bin/sip
  since the binary is identical. You can have both installed in parallel and
  remove either without breaking anything. (bnc#835161)

- Revert sr#79987, moving /usr/bin/sip into python-sip-bin and requiring
  that in python3-sip-devel (plus split provides) only causes trouble. It will
  make python3-sip-devel depend forever on Python2 for absolutely no reason.
  Both python-sip-devel and python3-sip-devel can happily provide /usr/bin/sip
  since the binary is identical. You can have both installed in parallel and
  remove either without breaking anything. (bnc#835161)

OBS-URL: https://build.opensuse.org/request/show/199357
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=107
This commit is contained in:
Dirk Mueller 2013-09-19 09:09:26 +00:00 committed by Git OBS Bridge
parent 9ba36b78b2
commit 740a61060a
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python-sip.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Sep 17 13:31:42 UTC 2013 - speilicke@suse.com
- Revert sr#79987, moving /usr/bin/sip into python-sip-bin and requiring
that in python3-sip-devel (plus split provides) only causes trouble. It will
make python3-sip-devel depend forever on Python2 for absolutely no reason.
Both python-sip-devel and python3-sip-devel can happily provide /usr/bin/sip
since the binary is identical. You can have both installed in parallel and
remove either without breaking anything. (bnc#835161)
-------------------------------------------------------------------
Wed Sep 11 06:48:38 UTC 2013 - tittiatcoke@gmail.com

22
python-sip.spec
View File

@ -50,7 +50,9 @@ Group: Development/Libraries/Python
Requires: %{name} = %{version}
Requires: c++_compiler
Requires: python-devel
Requires: python-sip-bin
Provides: python-sip-bin = %{version}
#TODO: Change back to '<' after next version update:
Obsoletes: python-sip-bin <= %{version}
%description devel
SIP is a tool that makes it very easy to create Python bindings for C
@ -61,19 +63,6 @@ for any C or C++ library.
This package contains all the developer tools you need to create your
own sip bindings.
%package bin
Summary: SIP tool to create python bindings
Group: Development/Libraries/Python
Provides: python-sip:/usr/bin/sip
%description bin
SIP is a tool that makes it very easy to create Python bindings for C
and C++ libraries. It was originally developed to create PyQt, the
Python bindings for the Qt toolkit, but can be used to create bindings
for any C or C++ library.
This package contains the sip executable.
%prep
%setup -q -n sip-%{rversion}
%patch0
@ -110,14 +99,11 @@ sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README
%doc README
%{py_sitedir}/sip.so
%files bin
%defattr(-,root,root,-)
%{_bindir}/sip
%files devel
%defattr(-,root,root,-)
%doc NEWS LICENSE* doc/
%config %{_sysconfdir}/rpm/macros.%name
%{_bindir}/sip
%{py_incdir}/sip.h
%{py_sitedir}/sipconfig.py
%{py_sitedir}/sipdistutils.py

10
python3-sip.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Sep 17 13:31:52 UTC 2013 - speilicke@suse.com
- Revert sr#79987, moving /usr/bin/sip into python-sip-bin and requiring
that in python3-sip-devel (plus split provides) only causes trouble. It will
make python3-sip-devel depend forever on Python2 for absolutely no reason.
Both python-sip-devel and python3-sip-devel can happily provide /usr/bin/sip
since the binary is identical. You can have both installed in parallel and
remove either without breaking anything. (bnc#835161)
-------------------------------------------------------------------
Wed Sep 11 06:49:37 UTC 2013 - tittiatcoke@gmail.com

10
python3-sip.spec
View File

@ -16,7 +16,6 @@
#
%global py3_incdir %(python3 -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc(True))" 2>/dev/null || echo PYTHON-NOT-FOUND)
%define rversion %{version}
%define python_sip_api 10.1
@ -50,9 +49,10 @@ Summary: SIP tool to create python bindings
Group: Development/Libraries/Python
Requires: %{name} = %{version}
Requires: c++_compiler
Requires: python-sip-bin
Requires: python3-devel
Provides: python3-sip:/usr/bin/sip
Provides: python3-sip-bin = %{version}
#TODO: Change back to '<' after next version update:
Obsoletes: python3-sip-bin <= %{version}
%description devel
SIP is a tool that makes it very easy to create Python bindings for C
@ -93,9 +93,6 @@ mkdir -p %{buildroot}%{_datadir}/sip
# Point to the correct location for the documentation files
sed -i 's/"doc" directory/"doc" directory of package %{name}-devel/' README
# sip executable is provided by python-sip-bin to avoid conflicts
rm %{buildroot}%{_bindir}/sip
install -m 644 -D macros.%name %{buildroot}/%{_sysconfdir}/rpm/macros.%name
%files
@ -107,6 +104,7 @@ install -m 644 -D macros.%name %{buildroot}/%{_sysconfdir}/rpm/macros.%name
%defattr(-,root,root,-)
%doc NEWS LICENSE* doc/
%config %{_sysconfdir}/rpm/macros.%name
%{_bindir}/sip
%{py3_incdir}/sip.h
%{python3_sitearch}/sipconfig.py
%{python3_sitearch}/sipdistutils.py