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

- Rebuild into Fedora

Browse Source 
Wed Apr 11 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.3.rc1
- Update langpacks
Thu Apr 5 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.2.rc1
- Build option tweaks
- Bring the install section to parity with Firefox's
Thu Apr 5 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.1.rc1
- Update to 2.0.0.0 RC1
This commit is contained in:
Christopher Aillon 2007-04-12 20:32:40 +00:00
parent 388614aaba
commit fec1589ed3
8 changed files with 4687 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,2 +1,2 @@
thunderbird-1.5.0.5-source.tar.bz2 thunderbird-2.0.0.0rc1-source.tar.bz2
thunderbird-langpacks-1.5.0.5-20060726.tar.bz2 thunderbird-langpacks-2.0.0.0-20070411.tar.bz2

19
firefox-2.0-link-layout.patch Normal file
View File

@ -0,0 +1,19 @@
Index: mozilla/layout/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/layout/build/Makefile.in,v
retrieving revision 1.127.8.7
diff -d -u -p -r1.127.8.7 Makefile.in
--- mozilla/layout/build/Makefile.in 17 Jul 2006 19:05:13 -0000 1.127.8.7
+++ mozilla/layout/build/Makefile.in 10 Oct 2006 04:29:16 -0000
@@ -240,6 +240,11 @@ EXTRA_DSO_LDOPTS += \
$(NULL)
endif
+# Add explicit X11 dependency when building against X11 toolkits
+ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT)))
+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) -lXrender
+endif
+
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += -I$(srcdir)/../base \

4594
firefox-2.0-pango-printing.patch Normal file
View File

File diff suppressed because it is too large Load Diff

4
sources
View File

@ -1,2 +1,2 @@
65087f8a7adb0773ae7198ec21cc2975 thunderbird-1.5.0.10-source.tar.bz2 8e672d9f9206e0e1f03790dacb51e1bb thunderbird-2.0.0.0rc1-source.tar.bz2
0ac9a4a17d12422858c07fe553ee9ac2 thunderbird-langpacks-1.5.0.10-20070301.tar.bz2 f77c5bbdf6aa126e60d22a14d0db6129 thunderbird-langpacks-2.0.0.0-20070411.tar.bz2

16
thunderbird-2.0-default-applications.patch Normal file
View File

@ -0,0 +1,16 @@
Index: mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp
===================================================================
RCS file: /cvsroot/mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp,v
retrieving revision 1.8.2.1
diff -d -u -p -r1.8.2.1 nsMailGNOMEIntegration.cpp
--- mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp 23 Oct 2006 03:32:47 -0000 1.8.2.1
+++ mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp 11 Apr 2007 18:50:02 -0000
@@ -69,7 +69,7 @@ static const char* const sFeedProtocols[
"feed"
};
-nsMailGNOMEIntegration::nsMailGNOMEIntegration(): mCheckedThisSession(PR_FALSE)
+nsMailGNOMEIntegration::nsMailGNOMEIntegration(): mCheckedThisSession(PR_TRUE)
{}
nsresult

2
thunderbird-mozconfig
View File

@ -1,5 +1,7 @@
. $topsrcdir/mail/config/mozconfig . $topsrcdir/mail/config/mozconfig
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
ac_add_options --with-system-nspr ac_add_options --with-system-nspr
ac_add_options --with-system-nss ac_add_options --with-system-nss
ac_add_options --with-system-jpeg ac_add_options --with-system-jpeg

4
thunderbird.sh.in
View File

@ -14,9 +14,9 @@ MOZILLA_FIVE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION"
MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION" MRE_HOME="$MOZ_LIB_DIR/thunderbird-TBIRD_VERSION"
export MOZILLA_FIVE_HOME MRE_HOME export MOZILLA_FIVE_HOME MRE_HOME
MOZ_PROGRAM=$MRE_HOME/thunderbird MOZ_PROGRAM=$MRE_HOME/thunderbird-bin
#MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird" #MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird"
MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird -remote" MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird-bin -remote"
## ##
## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default ## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default

76
thunderbird.spec
View File

@ -7,18 +7,18 @@
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 1.5.0.10 Version: 2.0.0.0
Release: 1%{?dist} Release: 0.4.rc1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPL License: MPL
Group: Applications/Internet Group: Applications/Internet
%if %{official_branding} %if ! %{official_branding}
%define tarball thunderbird-%{version}-source.tar.bz2 %define tarball thunderbird-%{version}-source.tar.bz2
%else %else
%define tarball thunderbird-1.5rc1-source.tar.bz2 %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2
%endif %endif
Source0: %{tarball} Source0: %{tarball}
Source1: thunderbird-langpacks-%{version}-20070301.tar.bz2 Source1: thunderbird-langpacks-%{version}-20070411.tar.bz2
Source10: thunderbird-mozconfig Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded Source11: thunderbird-mozconfig-branded
Source12: thunderbird-redhat-default-prefs.js Source12: thunderbird-redhat-default-prefs.js
@ -29,6 +29,7 @@ Source30: thunderbird-open-browser.sh
Source100: find-external-requires Source100: find-external-requires
# Build patches # Build patches
Patch1: firefox-2.0-link-layout.patch
Patch2: firefox-1.0-prdtoa.patch Patch2: firefox-1.0-prdtoa.patch
Patch4: firefox-1.5.0.10-with-system-nss.patch Patch4: firefox-1.5.0.10-with-system-nss.patch
Patch5: thunderbird-1.5-visibility.patch Patch5: thunderbird-1.5-visibility.patch
@ -38,7 +39,7 @@ Patch10: thunderbird-0.7.3-psfonts.patch
Patch11: thunderbird-0.7.3-gnome-uriloader.patch Patch11: thunderbird-0.7.3-gnome-uriloader.patch
# customization patches # customization patches
Patch24: thunderbird-0.8-default-applications.patch Patch24: thunderbird-2.0-default-applications.patch
Patch25: thunderbird-1.1-software-update.patch Patch25: thunderbird-1.1-software-update.patch
# local bugfixes # local bugfixes
@ -49,7 +50,7 @@ Patch42: firefox-1.1-uriloader.patch
Patch81: firefox-1.5-nopangoxft.patch Patch81: firefox-1.5-nopangoxft.patch
Patch82: firefox-1.5-pango-mathml.patch Patch82: firefox-1.5-pango-mathml.patch
Patch83: firefox-1.5-pango-cursor-position.patch Patch83: firefox-1.5-pango-cursor-position.patch
Patch84: firefox-1.5-pango-printing.patch Patch84: firefox-2.0-pango-printing.patch
Patch85: firefox-1.5-pango-cursor-position-more.patch Patch85: firefox-1.5-pango-cursor-position-more.patch
Patch86: firefox-1.5-pango-justified-range.patch Patch86: firefox-1.5-pango-justified-range.patch
Patch87: firefox-1.5-pango-underline.patch Patch87: firefox-1.5-pango-underline.patch
@ -104,24 +105,24 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
%prep %prep
%setup -q -n mozilla %setup -q -n mozilla
%patch1 -p1 -b .link-layout
%patch2 -p0 %patch2 -p0
%patch4 -p1 #%patch4 -p1
#%patch5 -p1 -b .visibility #%patch5 -p1 -b .visibility
%patch6 -p1 #%patch6 -p1
%patch10 -p1 -b .psfonts %patch10 -p1 -b .psfonts
%patch11 -p1 -b .gnome-uriloader %patch11 -p1 -b .gnome-uriloader
%patch24 -p1 %patch24 -p1 -b .default-applications
%patch25 -p0 #%patch25 -p0 -b .software-update
%patch40 -p1 %patch40 -p1
%patch42 -p0 %patch42 -p0
# font system fixes # font system fixes
%patch81 -p1 -b .nopangoxft %patch81 -p1 -b .nopangoxft
%patch82 -p1 -b .pango-mathml #%patch82 -p1 -b .pango-mathml
%patch83 -p1 -b .pango-cursor-position %patch83 -p1 -b .pango-cursor-position
%patch84 -p1 -b .pango-printing %patch84 -p0 -b .pango-printing
%patch85 -p1 -b .pango-cursor-position-more %patch85 -p1 -b .pango-cursor-position-more
%patch86 -p1 -b .pango-justified-range %patch86 -p1 -b .pango-justified-range
%patch87 -p1 -b .pango-underline %patch87 -p1 -b .pango-underline
@ -183,22 +184,14 @@ make -f client.mk build
%install %install
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
cd mail/installer DESTDIR=$RPM_BUILD_ROOT make install
%{__make} STRIP=/bin/true
cd -
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications} %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
%{__tar} -C $RPM_BUILD_ROOT%{_libdir}/ -xzf dist/%{name}-*linux*.tar.gz
%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{mozappdir}
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}-*linux*.tar
%{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png %{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor mozilla \ desktop-file-install --vendor mozilla \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
--add-category Application \ --add-category Application \
--add-category Network \ --add-category Network \
%{SOURCE20} %{SOURCE20}
@ -209,8 +202,9 @@ desktop-file-install --vendor mozilla \
%{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
install -m755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh install -m755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
perl -pi -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh %{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
# set up our default preferences
%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \ %{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \
-e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \ -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \
$RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/rh-default-prefs
@ -218,7 +212,7 @@ perl -pi -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js %{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
%{__rm} $RPM_BUILD_ROOT/rh-default-prefs %{__rm} $RPM_BUILD_ROOT/rh-default-prefs
%{__rm} -f $RPM_BUILD_ROOT%{mozappdir}/thunderbird-config %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/thunderbird-config
cd $RPM_BUILD_ROOT%{mozappdir}/chrome cd $RPM_BUILD_ROOT%{mozappdir}/chrome
find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \; find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
@ -243,20 +237,31 @@ for langpack in `ls thunderbird-langpacks/*.xpi`; do
unzip $langpack -d $extensiondir unzip $langpack -d $extensiondir
find $extensiondir -type f | xargs chmod 644 find $extensiondir -type f | xargs chmod 644
langtmp=%{_tmpdir}/%{name}/langpack-$language tmpdir=`mktemp -d %{name}.XXXXXXXX`
langtmp=$tmpdir/%{name}/langpack-$language
%{__mkdir_p} $langtmp %{__mkdir_p} $langtmp
jarfile=$extensiondir/chrome/$language.jar jarfile=$extensiondir/chrome/$language.jar
unzip $jarfile -d $langtmp unzip $jarfile -d $langtmp
find $langtmp -type f | xargs chmod 644 find $langtmp -type f | xargs chmod 644
%{__rm} -rf $jarfile %{__rm} -rf $jarfile
cd $langtmp cd $langtmp
zip -r -D $jarfile locale zip -r -D $jarfile locale
%{__rm} -rf locale %{__rm} -rf locale
cd - cd -
%{__rm} -rf $tmpdir
done done
%{__rm} -rf thunderbird-langpacks %{__rm} -rf thunderbird-langpacks
# Copy over the LICENSE
install -c -m 644 LICENSE $RPM_BUILD_ROOT%{mozappdir}
# ghost files
touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
%clean %clean
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
@ -272,11 +277,30 @@ update-desktop-database %{_datadir}/applications
%attr(755,root,root) %{_bindir}/thunderbird %attr(755,root,root) %{_bindir}/thunderbird
%attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
%attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png %attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png
%exclude %{_includedir}/%{name}-%{version}
%exclude %{_datadir}/idl/%{name}-%{version}
%exclude %{_libdir}/pkgconfig/*.pc
%{mozappdir} %{mozappdir}
#=============================================================================== #===============================================================================
%changelog %changelog
* Thu Apr 12 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.3.rc1
- Rebuild into Fedora
* Wed Apr 11 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.3.rc1
- Update langpacks
* Thu Apr 5 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.2.rc1
- Build option tweaks
- Bring the install section to parity with Firefox's
* Thu Apr 5 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.0-0.1.rc1
- Update to 2.0.0.0 RC1
* Sun Mar 25 2007 Christopher Aillon <caillon@redhat.com> 1.5.0.11-1
- Update to 1.5.0.11
* Fri Mar 2 2007 Martin Stransky <stransky@redhat.com> 1.5.0.10-1 * Fri Mar 2 2007 Martin Stransky <stransky@redhat.com> 1.5.0.10-1
- Update to 1.5.0.10 - Update to 1.5.0.10