diff --git a/.gitignore b/.gitignore index 8a4e129..cee1f7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/sip-4.16.9.tar.gz /sip-4.17.tar.gz +/sip-4.18.tar.gz diff --git a/macros.sip b/macros.sip index 8a49011..125a0c9 100644 --- a/macros.sip +++ b/macros.sip @@ -1,3 +1,3 @@ %_sip_api_major 11 -%_sip_api_minor 2 +%_sip_api_minor 3 %_sip_api %{_sip_api_major}.%{_sip_api_minor} diff --git a/sip-4.16.3-no_rpath.patch b/sip-4.16.3-no_rpath.patch deleted file mode 100644 index e413615..0000000 --- a/sip-4.16.3-no_rpath.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up sip-4.16.3/siputils.py.no_rpath sip-4.16.3/siputils.py ---- sip-4.16.3/siputils.py.no_rpath 2014-09-15 10:04:52.937257433 -0500 -+++ sip-4.16.3/siputils.py 2014-09-15 10:04:52.941257392 -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) -@@ -611,7 +611,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-4.16.3-no_strip.patch b/sip-4.16.3-no_strip.patch deleted file mode 100644 index b016c52..0000000 --- a/sip-4.16.3-no_strip.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up sip-4.16.3/siputils.py.no_strip sip-4.16.3/siputils.py ---- sip-4.16.3/siputils.py.no_strip 2014-09-07 10:30:09.000000000 -0500 -+++ sip-4.16.3/siputils.py 2014-09-15 10:02:48.635526544 -0500 -@@ -1463,7 +1463,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. -@@ -1774,7 +1774,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.18-no_rpath.patch b/sip-4.18-no_rpath.patch new file mode 100644 index 0000000..406a26c --- /dev/null +++ b/sip-4.18-no_rpath.patch @@ -0,0 +1,21 @@ +diff -up sip-4.18/siputils.py.no_rpath sip-4.18/siputils.py +--- sip-4.18/siputils.py.no_rpath 2015-03-25 06:00:24.000000000 -0500 ++++ sip-4.18/siputils.py 2016-04-13 11:34:48.179894616 -0500 +@@ -435,7 +435,7 @@ class Makefile: + if l_dir in ("", ".", ".."): + continue + +- rpaths.append(l) ++ #rpaths.append(l) + + if self._python: + incdir.append(self.config.py_inc_dir) +@@ -612,7 +612,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-4.18-no_strip.patch b/sip-4.18-no_strip.patch new file mode 100644 index 0000000..3273311 --- /dev/null +++ b/sip-4.18-no_strip.patch @@ -0,0 +1,21 @@ +diff -up sip-4.18/siputils.py.no_strip sip-4.18/siputils.py +--- sip-4.18/siputils.py.no_strip 2015-03-25 06:00:24.000000000 -0500 ++++ sip-4.18/siputils.py 2016-04-13 11:34:23.718690341 -0500 +@@ -1469,7 +1469,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. +@@ -1780,7 +1780,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.spec b/sip.spec index d16e26a..6a95c4b 100644 --- a/sip.spec +++ b/sip.spec @@ -16,8 +16,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.17 -Release: 5%{?dist} +Version: 4.18 +Release: 0.1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -28,16 +28,16 @@ Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}%{?snap:-snapshot- ## upstreamable patches # make install should not strip (by default), kills -debuginfo -Patch50: sip-4.16.3-no_strip.patch +Patch50: sip-4.18-no_strip.patch # try not to rpath the world -Patch51: sip-4.16.3-no_rpath.patch +Patch51: sip-4.18-no_rpath.patch ## upstream patches # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip %global _sip_api_major 11 -%global _sip_api_minor 2 +%global _sip_api_minor 3 %global _sip_api %{_sip_api_major}.%{_sip_api_minor} Provides: sip-api(%{_sip_api_major}) = %{_sip_api} @@ -152,6 +152,10 @@ make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_datadir}/python3-sip mv %{buildroot}%{_bindir}/sip %{buildroot}%{_bindir}/python3-sip popd + +## toplevel __pycache__ creation is ... inconsistent +## rawhide makes one, f23 local builds do not, so let's *make* it consistent +mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack %endif # Python 2 installation: @@ -182,7 +186,8 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python3_sitearch}/sip.so %{python3_sitearch}/sip*.py* -%{python3_sitearch}/__pycache__/* +#{python3_sitearch}/__pycache__/* +#exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %files -n python3-sip-devel # Note that the "sip" binary is invoked by name in a few places higher up @@ -194,6 +199,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Wed Apr 13 2016 Rex Dieter - 4.18-1 +- sip-4.18, sip-api(11)=11.3 + * Fri Feb 05 2016 Fedora Release Engineering - 4.17-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 8e93228..4313eac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca51677770fa62dd5087877688cf97ba sip-4.17.tar.gz +78724bf2a79878201c3bc81a1d8248ea sip-4.18.tar.gz