From 653f7de7d3486db4ea86d2d699fe6c4a50b6da3c57da23a2c9a428b7fd39165f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 16 May 2008 23:24:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=22 --- MozillaThunderbird.changes | 5 +++++ MozillaThunderbird.spec | 15 ++++++++++----- unused-includes.patch | 21 +++++++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 unused-includes.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 844c8b6..31c6f9e 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 16 16:59:40 CEST 2008 - schwab@suse.de + +- Remove unused includes. + ------------------------------------------------------------------- Mon Mar 24 20:17:09 CET 2008 - maw@suse.de diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 61b7773..fa3906c 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -8,14 +8,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: MozillaThunderbird BuildRequires: fdupes gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel unzip update-desktop-files zip License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Version: 2.0.0.12 -Release: 7 +Release: 28 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -52,6 +51,7 @@ Patch27: thunderbird-1.5.0.8-uninitalized-vars-232305.patch #Patch28: thunderbird-gcc4.3-fixes.patch Patch29: visibility.patch Patch30: mozilla-missing-decl.patch +Patch31: unused-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh %if %suse_version > 1000 @@ -73,7 +73,7 @@ Suggests: %{name}-translations %endif %if %has_system_nspr BuildRequires: mozilla-nspr-devel -Requires: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`) +Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) %endif %if %has_system_nss BuildRequires: mozilla-nss-devel @@ -114,6 +114,7 @@ Authors: Mozilla Foundation %package translations +License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Translations of MozillaThunderbird Provides: locale(MozillaThunderbird:be;bg;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;ga_IE;hu;it;ja;ko;lt;mk;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ru;sk;sl;sv_SE;tr;zh_CN;zh_TW) Group: Productivity/Networking/Email/Clients @@ -130,10 +131,11 @@ Authors: Mozilla Foundation %package devel +License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: The Stand-Alone Mozilla Mail Component Group: Productivity/Networking/Email/Clients %if %has_system_nspr -Requires: mozilla-nspr-devel >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel`) +Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) %endif %if %has_system_nss PreReq: mozilla-nss-devel @@ -183,6 +185,7 @@ cd $RPM_BUILD_DIR/mozilla %patch27 -p0 # %patch28 -p1 %patch30 -p1 +%patch31 %build export MOZ_BUILD_DATE=%{releasedate} @@ -671,6 +674,8 @@ exit 0 %{_bindir}/thunderbird-config %changelog +* Fri May 16 2008 schwab@suse.de +- Remove unused includes. * Mon Mar 24 2008 maw@suse.de - Add mozilla-missing-decl.patch, which is necessary when building against new versions of mozilla-nss (bmo#399589). @@ -815,7 +820,7 @@ exit 0 - improved postscript output (bmo #334485) - changed defaults for printer properties (#6534) - get available paper sizes from CUPS (#65482) -* Sat Mar 18 2006 stark@suse.de +* Sun Mar 19 2006 stark@suse.de - translations package is suggested now by main package - yet another set of upstream fixes (#148876) * Sun Mar 12 2006 stark@suse.de diff --git a/unused-includes.patch b/unused-includes.patch new file mode 100644 index 0000000..b31a37a --- /dev/null +++ b/unused-includes.patch @@ -0,0 +1,21 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf32.cpp ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf32.cpp +@@ -39,8 +39,6 @@ + + #include "xptcprivate.h" + +-#include +- + // "This code is for IA64 only" + + +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf64.cpp ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf64.cpp +@@ -40,7 +40,6 @@ + #include "xptcprivate.h" + + #include +-#include + + // "This code is for IA64 only" +