Attachment 409281 Details for Bug 545124 – Patch against devel/sip.spec

[patch] Patch against devel/sip.spec

fix-python3-sip-subpackage-and-enable-it.patch (text/plain), 4.88 KB, created by Dave Malcolm on 2010-04-26 20:16:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Malcolm

Created: 2010-04-26 20:16:33 UTC

Size: 4.88 KB

patch

obsolete

>? .build-4.10.2-2.fc14.log
>? python3-sip-4.10.2-2.fc14
>? sip-4.10.2
>? sip-4.10.2-2.fc14.src.rpm
>? x86_64
>Index: sip.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/sip/devel/sip.spec,v
>retrieving revision 1.78
>diff -u -p -r1.78 sip.spec
>--- sip.spec	17 Apr 2010 20:42:10 -0000	1.78
>+++ sip.spec	26 Apr 2010 20:09:44 -0000
>@@ -1,9 +1,8 @@
> 
>-%global with_python3 0
>+%global with_python3 1
> 
> %if 0%{?with_python3}
> %{!?python3_inc:%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")}
>-%global python3dir   python3-%{name}-%{version}%{?snap:-snapshot-%{snap}}
> %endif
> 
> %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
>@@ -12,7 +11,7 @@
> Summary: SIP - Python/C++ Bindings Generator
> Name: sip
> Version: 4.10.2
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> License: GPLv2 or GPLv3
> Group: Development/Tools
> Url: http://www.riverbankcomputing.com/software/sip/intro 
>@@ -45,12 +44,23 @@ explicit support for the signal slot mec
> libraries. However, SIP can be used to generate Python bindings for any C++
> class library.
> 
>+%package macros
>+Summary: RPM macros for use when working with SIP
>+Group: Development/Tools
>+Requires: rpm
>+
>+%description macros
>+This package contains RPM macros for use when working with SIP.  It is used
>+by both the sip-devel (python 2) and python3-sip-devel subpackages.
>+
> %package devel
> Summary: Files needed to generate Python bindings for any C++ class library
> Group: Development/Libraries
> Requires: %{name} = %{version}-%{release}
> Requires: python-devel 
> Requires: rpm
>+Requires: sip-macros = %{version}-%{release}
>+
> %description devel
> This package contains files needed to generate Python bindings for any C++
> classes library.
>@@ -79,7 +89,7 @@ Summary: Files needed to generate Python
> Group: Development/Libraries
> Requires: python3-sip = %{version}-%{release}
> Requires: python3-devel
>-Requires: rpm
>+Requires: sip-macros = %{version}-%{release}
> 
> %description -n python3-sip-devel
> This package contains files needed to generate Python 3 bindings for any C++
>@@ -92,10 +102,8 @@ classes library.
> %setup -q -n %{name}-%{version}%{?snap:-snapshot-%{snap}}
> 
> %if 0%{?with_python3}
>-#FIXME: rdieter says: reuse the %setup macro - but this is a simple case, without lots of patch application etc
>-pushd ..
>-cp -a %{name}-%{version}%{?snap:-snapshot-%{snap}} %{python3dir}
>-popd
>+rm -rf %{py3dir}
>+cp -a . %{py3dir}
> %endif
> 
> 
>@@ -105,7 +113,7 @@ popd
> make %{?_smp_mflags} 
> 
> %if 0%{?with_python3}
>-pushd ../%{python3dir}
>+pushd %{py3dir}
> %{__python3} configure.py -d %{python3_sitearch} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" --sipdir=%{_datadir}/python3-sip
> 
> make %{?_smp_mflags} 
>@@ -116,19 +124,23 @@ popd
> %install
> rm -rf %{buildroot}
> 
>-make install DESTDIR=%{buildroot}
>-mkdir -p %{buildroot}%{_datadir}/sip
>-
>-install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.sip
>-
>+# Perform the Python 3 installation first, to avoid stomping over the Python 2
>+# /usr/bin/sip:
> %if 0%{?with_python3}
>-pushd ../%{python3dir}
>-#FIXME: this is going to stomp over /usr/bin/sip from the python2 build above:
>+pushd %{py3dir}
> make install DESTDIR=%{buildroot}
> mkdir -p %{buildroot}%{_datadir}/python3-sip
>+mv %{buildroot}/%{_bindir}/sip %{buildroot}/%{_bindir}/python3-sip
> popd
> %endif
> 
>+# Python 2 installation:
>+make install DESTDIR=%{buildroot}
>+mkdir -p %{buildroot}%{_datadir}/sip
>+
>+# Macros shared by both the 2 and 3 -devel subpackages:
>+install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.sip
>+
> 
> %clean
> rm -rf %{buildroot}
>@@ -140,26 +152,39 @@ rm -rf %{buildroot}
> %doc NEWS README
> %{python_sitearch}/*
> 
>+%files macros
>+%defattr(-,root,root,-)
>+%{_sysconfdir}/rpm/macros.sip
>+
> %files devel
> %defattr(-,root,root,-)
> %{_bindir}/sip
> %{_datadir}/sip/
> %{python_inc}/*
>-%{_sysconfdir}/rpm/macros.sip
> 
> %if 0%{?with_python3}
> %files -n python3-sip
> %{python3_sitearch}/*
> 
> %files -n python3-sip-devel
>-# FIXME: what should the python3 sip binary be named?  It gets invoked by name in various places higher up in the KDE-Python stack...
>-%{_bindir}/sip-3
>-%{_datadir}/python-3sip/
>+# Note that the "sip" binary is invoked by name in a few places higher up
>+# in the KDE-Python stack; these will need changing to "python3-sip":
>+%{_bindir}/python3-sip
>+%{_datadir}/python3-sip/
> %{python3_inc}/*
> %endif
> 
> 
> %changelog
>+* Mon Apr 26 2010 David Malcolm <dmalcolm@redhat.com> - 4.10.2-2
>+- enable "with_python3" in the build
>+- use py3dir throughout, as provided by python3-devel, rather than using our
>+own
>+- name the python 3 sip binary "python3-sip", and avoid it clobbering the
>+python 2 sip binary
>+- fix a typo in the name of the data dir: python-3sip -> python3-sip
>+- split out macros.sip into a new subpackage
>+
> * Sat Apr 17 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.10.2-1
> - sip-4.10.2
>

Actions: View | Diff

Attachments on bug 545124: 376729 | 409281