rpms/thunderbird/devel thunderbird.spec, 1.163, 1.164 thunderbird-clipboard-crash.patch, 1.1, NONE thunderbird-debuginfo-fix-include.patch, 1.1, NONE

Jan Horak xhorak at fedoraproject.org
Tue Mar 30 08:07:08 UTC 2010


Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22474

Modified Files:
	thunderbird.spec 
Removed Files:
	thunderbird-clipboard-crash.patch 
	thunderbird-debuginfo-fix-include.patch 
Log Message:
Update to 3.0.4


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -p -r1.163 -r1.164
--- thunderbird.spec	30 Mar 2010 07:43:20 -0000	1.163
+++ thunderbird.spec	30 Mar 2010 08:07:08 -0000	1.164
@@ -35,34 +35,41 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 %if %{build_langpacks}
+# Language package archive is build by RH
 Source1:        thunderbird-langpacks-%{version}-20100330.tar.bz2
 %endif
+# Config file for compilation
 Source10:       thunderbird-mozconfig
+# Config file for branded compilation
 Source11:       thunderbird-mozconfig-branded
+# Default preferences for Thunderbird
 Source12:       thunderbird-redhat-default-prefs.js
+# Config file for debug builds
 Source13:       thunderbird-mozconfig-debuginfo
+# Desktop file
 Source20:       thunderbird.desktop
+# TB execute script
 Source21:       thunderbird.sh.in
+# Script called when user click on link in message
 Source30:       thunderbird-open-browser.sh
+# Finds requirements provided outside of the current file set
 Source100:      find-external-requires
 
+# Fix for version issues
 Patch0:         thunderbird-version.patch
+# Fix for jemalloc
 Patch1:         mozilla-jemalloc.patch
+# Fix for installation fail when building with dynamic linked libraries
 Patch2:         thunderbird-shared-error.patch
-Patch3:         thunderbird-debuginfo-fix-include.patch
-Patch4:         thunderbird-clipboard-crash.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
 
-
 %else
 # Not yet approved by Mozillla Corporation
 
-
 %endif
 
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
@@ -88,7 +95,6 @@ BuildRequires:  startup-notification-dev
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf213
 BuildRequires:  desktop-file-utils
-
 Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
@@ -145,23 +151,14 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
 
-%if %{include_debuginfo}
-%patch3 -p1 -b .fix-include
-%endif
-
-%patch4 -p1 -b .clipboard-crash
-
 %if %{official_branding}
 # Required by Mozilla Corporation
 
-
 %else
 # Not yet approved by Mozillla Corporation
 
-
 %endif
 
-
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 %if %{official_branding}
@@ -340,9 +337,13 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/debug
 cp %{moz_objdir}/mozilla/dist/thunderbird-%{version}.en-US.linux-i686.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_libdir}/debug%{mozappdir}
 %endif
 
+#===============================================================================
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+#===============================================================================
+
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
@@ -350,6 +351,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+#===============================================================================
+
 %postun
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
@@ -357,6 +360,8 @@ if [ -x %{_bindir}/gtk-update-icon-cache
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+#===============================================================================
+
 %files -f %{tarballdir}/%{name}.lang
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/thunderbird


--- thunderbird-clipboard-crash.patch DELETED ---


--- thunderbird-debuginfo-fix-include.patch DELETED ---



More information about the scm-commits mailing list