From b789275bcc8b7fe42f16a3c721782cf16ed6d939 Mon Sep 17 00:00:00 2001 From: Rosa Date: Mon, 10 Jun 2013 15:23:53 +0400 Subject: [PATCH] Automatic import for version 4.14.2-1.fc18 --- .abf.yml | 2 + macros.sip | 3 + sip-4.12.1-no_strip.patch | 21 ++ sip-4.13.3-no_rpath.patch | 23 ++ sip.spec | 470 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 519 insertions(+) create mode 100644 .abf.yml create mode 100644 macros.sip create mode 100644 sip-4.12.1-no_strip.patch create mode 100644 sip-4.13.3-no_rpath.patch create mode 100644 sip.spec diff --git a/.abf.yml b/.abf.yml new file mode 100644 index 0000000..273c1de --- /dev/null +++ b/.abf.yml @@ -0,0 +1,2 @@ +sources: + "sip-4.14.2.tar.gz": ce836f600b6c8c2c7700d7902492ba6d96404fd9 diff --git a/macros.sip b/macros.sip new file mode 100644 index 0000000..da6d051 --- /dev/null +++ b/macros.sip @@ -0,0 +1,3 @@ +%_sip_api_major 9 +%_sip_api_minor 1 +%_sip_api %{_sip_api_major}.%{_sip_api_minor} diff --git a/sip-4.12.1-no_strip.patch b/sip-4.12.1-no_strip.patch new file mode 100644 index 0000000..ea49738 --- /dev/null +++ b/sip-4.12.1-no_strip.patch @@ -0,0 +1,21 @@ +diff -up sip-4.12.1/siputils.py.no_strip sip-4.12.1/siputils.py +--- sip-4.12.1/siputils.py.no_strip 2011-01-22 07:45:38.000000000 -0600 ++++ sip-4.12.1/siputils.py 2011-02-25 13:48:12.473741314 -0600 +@@ -1340,7 +1340,7 @@ class ModuleMakefile(Makefile): + """ + def __init__(self, configuration, build_file, install_dir=None, static=0, + console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, +- dir=None, makefile="Makefile", installs=None, strip=1, ++ dir=None, makefile="Makefile", installs=None, strip=0, + export_all=0, universal=None, arch=None, + deployment_target=None): + """Initialise an instance of a module Makefile. +@@ -1657,7 +1657,7 @@ class SIPModuleMakefile(ModuleMakefile): + """ + def __init__(self, configuration, build_file, install_dir=None, static=0, + console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, +- dir=None, makefile="Makefile", installs=None, strip=1, ++ dir=None, makefile="Makefile", installs=None, strip=0, + export_all=0, universal=None, arch=None, prot_is_public=0, + deployment_target=None): + """Initialise an instance of a SIP generated module Makefile. diff --git a/sip-4.13.3-no_rpath.patch b/sip-4.13.3-no_rpath.patch new file mode 100644 index 0000000..b5d55ba --- /dev/null +++ b/sip-4.13.3-no_rpath.patch @@ -0,0 +1,23 @@ +## HACK indeed, let's not rpath the world, mm-kay? -- rex + +diff -up sip-4.13.3/siputils.py.no_rpath sip-4.13.3/siputils.py +--- sip-4.13.3/siputils.py.no_rpath 2012-06-22 06:54:54.311308656 -0500 ++++ sip-4.13.3/siputils.py 2012-06-22 06:55:58.998499957 -0500 +@@ -434,7 +434,7 @@ class Makefile: + if l_dir in ("", ".", ".."): + continue + +- rpaths.append(l) ++ #rpaths.append(l) + + if self._python: + incdir.append(self.config.py_inc_dir) +@@ -603,7 +603,7 @@ class Makefile: + # Handle library directories. + libdir_qt = self.optional_list("LIBDIR_QT") + libdir.extend(libdir_qt) +- rpaths.extend(libdir_qt) ++ #rpaths.extend(libdir_qt) + + if qt_version >= 0x040000: + # Try and read QT_LIBINFIX from qconfig.pri. diff --git a/sip.spec b/sip.spec new file mode 100644 index 0000000..64801f2 --- /dev/null +++ b/sip.spec @@ -0,0 +1,470 @@ +%if 0%{?fedora} > 12 +%global with_python3 1 +%endif + +%if 0%{?with_python3} +%{!?python3_inc:%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")} +%endif +%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_inc:%global python_inc %(%{__python} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")} + +Summary: SIP - Python/C++ Bindings Generator +Name: sip +Version: 4.14.2 +Release: 1%{?dist} + +# sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) +License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) +Group: Development/Tools +Url: http://www.riverbankcomputing.com/software/sip/intro +#URL: http://sourceforge.net/projects/pyqt/ +Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}%{?snap:-snapshot-%{snap}}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +## upstreamable patches +# make install should not strip (by default), kills -debuginfo +Patch50: sip-4.12.1-no_strip.patch +# try not to rpath the world +Patch51: sip-4.13.3-no_rpath.patch + +# extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines +Source1: macros.sip +%global _sip_api_major 9 +%global _sip_api_minor 1 +%global _sip_api %{_sip_api_major}.%{_sip_api_minor} + +Provides: sip-api(%{_sip_api_major}) = %{_sip_api} +Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} + +BuildRequires: python-devel +BuildRequires: sed + +%if 0%{?with_python3} +BuildRequires: python3-devel +%endif + +%description +SIP is a tool for generating bindings for C++ classes so that they can be +accessed as normal Python classes. SIP takes many of its ideas from SWIG but, +because it is specifically designed for C++ and Python, is able to generate +tighter bindings. SIP is so called because it is a small SWIG. + +SIP was originally designed to generate Python bindings for KDE and so has +explicit support for the signal slot mechanism used by the Qt/KDE class +libraries. However, SIP can be used to generate Python bindings for any C++ +class library. + +%package devel +Summary: Files needed to generate Python bindings for any C++ class library +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-macros = %{version}-%{release} +Requires: python-devel +%description devel +This package contains files needed to generate Python bindings for any C++ +classes 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. +%if 0%{?with_python3} +It is used by both the sip-devel (python 2) and python3-sip-devel subpackages. +%endif + +%if 0%{?with_python3} +%package -n python3-sip +Summary: SIP - Python 3/C++ Bindings Generator +Group: Development/Tools +Provides: python3-sip-api(%{_sip_api_major}) = %{_sip_api} +Provides: python3-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +%description -n python3-sip +This is the Python 3 build of SIP. + +SIP is a tool for generating bindings for C++ classes so that they can be +accessed as normal Python 3 classes. SIP takes many of its ideas from SWIG but, +because it is specifically designed for C++ and Python, is able to generate +tighter bindings. SIP is so called because it is a small SWIG. + +SIP was originally designed to generate Python bindings for KDE and so has +explicit support for the signal slot mechanism used by the Qt/KDE class +libraries. However, SIP can be used to generate Python 3 bindings for any C++ +class library. + +%package -n python3-sip-devel +Summary: Files needed to generate Python 3 bindings for any C++ class library +Group: Development/Libraries +Requires: %{name}-macros = %{version}-%{release} +Requires: python3-sip%{?_isa} = %{version}-%{release} +Requires: python3-devel +%description -n python3-sip-devel +This package contains files needed to generate Python 3 bindings for any C++ +classes library. +%endif + + +%prep + +%setup -q -n %{name}-%{version}%{?snap:-snapshot-%{snap}} + +%patch50 -p1 -b .no_strip +%patch51 -p1 -b .no_rpath + +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif + + +%build +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} configure.py -d %{python3_sitearch} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" --sipdir=%{_datadir}/python3-sip + +make %{?_smp_mflags} +popd +%endif + +%{__python} configure.py -d %{python_sitearch} CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" + +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} + +# Perform the Python 3 installation first, to avoid stomping over the Python 2 +# /usr/bin/sip: +%if 0%{?with_python3} +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 used by -devel subpackages: +install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.sip + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc LICENSE LICENSE-GPL2 LICENSE-GPL3 +%doc NEWS README +%{python_sitearch}/* + +%files devel +%defattr(-,root,root,-) +%{_bindir}/sip +%{_datadir}/sip/ +%{python_inc}/* + +%files macros +%defattr(-,root,root,-) +%{_sysconfdir}/rpm/macros.sip + +%if 0%{?with_python3} +%files -n python3-sip +%defattr(-,root,root,-) +%{python3_sitearch}/* + +%files -n python3-sip-devel +%defattr(-,root,root,-) +# 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 +* Sun Dec 09 2012 Rex Dieter 4.14.2-1 +- sip-4.14.2 + +* Sun Oct 28 2012 Rex Dieter - 4.14.1-1 +- sip-4.14.1 +- sip-api(9) = 9.1 + +* Mon Oct 01 2012 Rex Dieter - 4.14-1 +- sip-4.14 +- sip-api(9) = 9.0 + +* Sat Aug 04 2012 David Malcolm - 4.13.3-4 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + +* Fri Aug 3 2012 David Malcolm - 4.13.3-3 +- make with_python3 be conditional on fedora + +* Sat Jul 21 2012 Fedora Release Engineering - 4.13.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jun 22 2012 Rex Dieter 4.13.3-1 +- 4.13.3 + +* Sat Feb 11 2012 Rex Dieter 4.13.2-1 +- 4.13.2 + +* Sat Jan 14 2012 Fedora Release Engineering - 4.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 23 2011 Rex Dieter 4.13.1-1 +- 4.13.1 + +* Wed Oct 26 2011 Rex Dieter 4.13-1 +- 4.13 + +* Fri Sep 23 2011 Rex Dieter 4.12.4-3 +- License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) (#226419) + +* Wed Sep 14 2011 Rex Dieter 4.12.4-2 +- try not to rpath the world (#737236) + +* Wed Aug 10 2011 Rex Dieter 4.12.4-1 +- 4.12.4 + +* Wed Jun 08 2011 Rex Dieter 4.12.3-1 +- 4.12.3 + +* Mon May 02 2011 Rex Dieter 4.12.2-1 +- 4.12.2 + +* Tue Mar 22 2011 Rex Dieter 4.12.1-5 +- Provides: (python3-)sip-api(...)%%{_isa} ... (ie, make it arch'd) + +* Fri Feb 25 2011 Rex Dieter 4.12.1-4 +- no_strip patch, fixes -debuginfo + +* Wed Feb 09 2011 Fedora Release Engineering - 4.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jan 27 2011 Rex Dieter 4.12.1-2 +- macros.sip: %%_sip_api_minor 1 + +* Mon Jan 24 2011 Rex Dieter 4.12.1-1 +- sip-4.12.1 + +* Sat Jan 15 2011 Rex Dieter - 4.12.1-0.1.fa100876a783 +- sip-4.12.1 snapshot + +* Thu Dec 30 2010 Rex Dieter - 4.12-2 +- rebuild (python3) + +* Fri Dec 24 2010 Rex Dieter - 4.12-1 +- sip-4.12 + +* Tue Nov 16 2010 Rex Dieter - 4.11.2-2 +- add missing %%defattr to python3- pkgs (#226419) + +* Sat Oct 23 2010 Rex Dieter - 4.11.2-1 +- sip-4.11.2 + +* Wed Sep 08 2010 Rex Dieter - 4.11.1-1 +- sip-4.11.1 +- sip-api(8) = 8.0 + +* Wed Aug 25 2010 Thomas Spura - 4.10.5-3 +- rebuild with python3.2 + http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html + +* Thu Jul 22 2010 David Malcolm - 4.10.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Fri Jul 16 2010 Rex Dieter 4.10.5-1 +- sip-4.10.5 + +* Wed Jul 14 2010 Rex Dieter 4.10.3-1 +- sip-4.10.3 + +* Fri Jun 25 2010 Karsten Hopp 4.10.2-3 +- bump and rebuild so that s390 will build the python3-sip packages + +* Mon Apr 26 2010 David Malcolm - 4.10.2-2 +- enable "with_python3" in the build +- use py3dir throughout, as provided by python3-devel +- name the python 3 sip binary "python3-sip" +- 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 - 4.10.2-1 +- sip-4.10.2 + +* Thu Mar 18 2010 Rex Dieter - 4.10.1-2 +- _sip_api_minor 1 + +* Thu Mar 18 2010 Rex Dieter - 4.10.1-1 +- sip-4.10.1 + +* Fri Jan 15 2010 Rex Dieter - 4.10-1 +- sip-4.10 (final) + +* Fri Jan 08 2010 Rex Dieter - 4.10-0.2.20100102 +- RFE: Support python3 when building sip (#545124) +- drop old pre v4 changelog + +* Thu Jan 07 2010 Rex Dieter - 4.10-0.1.20100102 +- sip-4.10-snapshot-20100102 + +* Mon Nov 23 2009 Rex Dieter - 4.9.3-1 +- sip-4.9.3 + +* Fri Nov 20 2009 Rex Dieter - 4.9.2-1 +- sip-4.9.2 + +* Tue Nov 16 2009 Rex Dieter - 4.9.1-3 +- move sip binary to -devel + +* Mon Nov 16 2009 Rex Dieter - 4.9.1-2 +- Provides: sip-api(%%_sip_api_major) = %%_sip_api +- devel: /etc/rpm/macros.sip helper + +* Fri Oct 23 2009 Rex Dieter - 4.9.1-1 +- sip-4.9.1 + +* Thu Oct 15 2009 Rex Dieter - 4.9.1-0.1.20091014 +- sip-4.9.1-snapshot-20091014 + +* Thu Oct 15 2009 Rex Dieter - 4.9-1 +- sip-4.9 +- License: GPLv2 or GPLv3 + +* Mon Aug 10 2009 Ville Skyttä - 4.8.2-2 +- Convert specfile to UTF-8. + +* Tue Jul 28 2009 Rex Dieter - 4.8.2-1 +- sip-4.8.2 + +* Sun Jul 26 2009 Fedora Release Engineering - 4.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jun 16 2009 Rex Dieter - 4.8.1-1 +- sip-4.8.1 + +* Fri Jun 05 2009 Rex Dieter - 4.8-1 +- sip-4.8 + +* Thu May 21 2009 Rex Dieter - 4.8-0.1.20090430 +- sip-4.8-snapshot-20090430 + +* Wed Feb 25 2009 Fedora Release Engineering - 4.7.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 4.7.9-2 +- Rebuild for Python 2.6 + +* Mon Nov 17 2008 Rex Dieter 4.7.9-1 +- sip-4.7.9 + +* Mon Nov 10 2008 Rex Dieter 4.7.8-1 +- sip-4.7.8 + +* Thu Sep 04 2008 Tom "spot" Callaway 4.7.7-3 +- fix license tag + +* Tue Sep 02 2008 Than Ngo 4.7.7-2 +- get rid of BR on qt + +* Tue Aug 26 2008 Rex Dieter - 4.7.7-1 +- sip-4.7.7 + +* Wed May 21 2008 Rex Dieter - 4.7.6-1 +- sip-4.7.6 + +* Wed May 14 2008 Rex Dieter - 4.7.5-1 +- sip-4.7.5 + +* Tue Mar 25 2008 Rex Dieter - 4.7.4-3 +- BR: qt3-devel (f9+) + +* Tue Feb 12 2008 Rex Dieter - 4.7.4-2 +- fix 64bit patch + +* Tue Feb 12 2008 Rex Dieter - 4.7.4-1 +- sip-4.7.4 + +* Thu Dec 06 2007 Rex Dieter - 4.7.3-1 +- sip-4.7.3 + +* Wed Dec 05 2007 Rex Dieter - 4.7.2-1 +- sip-4.7.2 +- omit needless scriptlets + +* Mon Nov 12 2007 Rex Dieter - 4.7.1-2 +- License: Python Software Foundation License v2 +- fix/cleanup some macro usage +- fix Source, Url. + +* Mon Oct 22 2007 Than Ngo - 4.7.1-1 +- 4.7.1 + +* Mon Oct 01 2007 Than Ngo - 4.6-3 +- fix rh#289321, sipconfig.py includes wrong py_lib_dir, thanks to Rex Dieter + +* Thu Aug 30 2007 Than Ngo - 4.6-2.fc7 +- typo in description + +* Thu Apr 12 2007 Than Ngo - 4.6-1.fc7 +- 4.6 + +* Thu Jan 18 2007 Than Ngo - 4.5.2-1 +- 4.5.2 + +* Thu Dec 7 2006 Jeremy Katz - 4.5-2 +- rebuild against python 2.5 +- cleanups for python packaging guidelines + +* Mon Nov 06 2006 Than Ngo 4.5-1 +- 4.5 + +* Thu Sep 28 2006 Than Ngo 4.4.5-3 +- fix #207297, use qt qmake files + +* Wed Sep 20 2006 Than Ngo 4.4.5-2 +- fix #206633, own %%_datadir/sip + +* Wed Jul 19 2006 Than Ngo 4.4.5-1 +- update to 4.4.5 + +* Mon Jul 17 2006 Than Ngo 4.4.3-2 +- rebuild + +* Wed Jul 12 2006 Jesse Keating - 4.4.3-1.1 +- rebuild + +* Thu Apr 27 2006 Than Ngo 4.4.3-1 +- update to 4.4.3 +- built with %%{optflags} + +* Fri Feb 10 2006 Jesse Keating - 4.3.1-1.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 4.3.1-1.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Sep 12 2005 Than Ngo 4.3.1-1 +- update to 4.3.1 + +* Wed Mar 23 2005 Than Ngo 4.2.1-1 +- 4.2.1 + +* Fri Mar 04 2005 Than Ngo 4.2-1 +- 4.2 + +* Thu Nov 11 2004 Than Ngo 4.1-2 +- rebuild against python 2.4 + +* Fri Sep 24 2004 Than Ngo 4.1-1 +- update to 4.1