From 736e3839a46d244e43048217ba79faba87053625 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 25 2011 19:52:00 +0000 Subject: no_strip patch, fixes -debuginfo --- 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.spec b/sip.spec index 8027423..59018af 100644 --- a/sip.spec +++ b/sip.spec @@ -12,13 +12,17 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.12.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 or GPLv3 Group: Development/Tools Url: http://www.riverbankcomputing.com/software/sip/intro Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/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 + # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip %global _sip_api_major 8 @@ -102,6 +106,8 @@ classes library. %setup -q -n %{name}-%{version}%{?snap:-snapshot-%{snap}} +%patch50 -p1 -b .no_strip + %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -179,6 +185,9 @@ rm -rf %{buildroot} %changelog +* 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