rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Bring back the default mailer check

Browse Source 
but we don't want the default of '/usr/lib{,64}/thunderbird-XYZ/thunderbird %s'
change it to be simply 'thunderbird %s'
This commit is contained in:
Christopher Aillon 2011-02-07 18:20:12 -08:00
parent 04177bbc2e
commit c14743c4a7
2 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
thunderbird-default.patch Normal file
View File

@ -0,0 +1,34 @@
diff -up comm-1.9.2/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp.default comm-1.9.2/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp
--- comm-1.9.2/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp.default 2010-12-07 08:35:33.000000000 -0800
+++ comm-1.9.2/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp 2011-02-07 17:32:42.866343508 -0800
@@ -104,8 +104,6 @@ static const char kDesktopColorKey[] = D
nsresult
nsGNOMEShellService::Init()
{
- nsresult rv;
-
// GConf and GnomeVFS _must_ be available, or we do not allow
// CreateInstance to succeed.
@@ -120,19 +118,9 @@ nsGNOMEShellService::Init()
// the locale encoding. If it's not set, they use UTF-8.
mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nsnull;
- nsCOMPtr<nsIProperties> dirSvc
- (do_GetService("@mozilla.org/file/directory_service;1"));
- NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);
-
- nsCOMPtr<nsILocalFile> appPath;
- rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile),
- getter_AddRefs(appPath));
- NS_ENSURE_SUCCESS(rv, rv);
+ mAppPath.Assign(NS_LITERAL_CSTRING(MOZ_APP_NAME));
- rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
- NS_ENSURE_SUCCESS(rv, rv);
-
- return appPath->GetNativePath(mAppPath);
+ return NS_OK;
}
NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)

17
thunderbird.spec
View File

@ -35,7 +35,7 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: %{thunderbird_version}
Release: 4%{?dist}
Release: 5%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -58,8 +58,9 @@ Source30: thunderbird-open-browser.sh
Source100: find-external-requires
Patch0: thunderbird-version.patch
Patch1: mozilla-jemalloc.patch
Patch2: thunderbird-shared-error.patch
Patch1: thunderbird-default.patch
Patch2: mozilla-jemalloc.patch
Patch3: thunderbird-shared-error.patch
Patch4: xulrunner-1.9.2.1-build.patch
Patch6: mozilla-libjpeg-turbo.patch
Patch7: mozilla-missing-cflags.patch
@ -141,8 +142,10 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
> version.patch
%{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch
%patch1 -p0 -b .jemalloc
%patch2 -p1 -b .shared-error
%patch1 -p1 -b .default-application
%patch2 -p0 -b .jemalloc
%patch3 -p1 -b .shared-error
%patch4 -p1 -b .protected
%patch6 -p1 -b .turbo
%patch7 -p1 -b .mozcflags
@ -152,7 +155,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
%patch9 -p1 -b .static
%patch10 -p1 -b .libnotify
%if %{official_branding}
# Required by Mozilla Corporation
@ -432,6 +434,9 @@ fi
#===============================================================================
%changelog
* Mon Feb 7 2011 Christopher Aillon <caillon@redhat.com> - 3.1.7-5
- Bring back the default mailer check but fix up the directory
* Wed Dec 15 2010 Jan Horak <jhorak@redhat.com> - 3.1.7-4
- Mozilla crash reporter enabled