diff --git a/thunderbird.spec b/thunderbird.spec index e114d47..4112e0b 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -10,13 +10,13 @@ %define source_dir comm-esr%(echo %version | cut -d. -f1) Name: thunderbird -Version: 38.4.0 +Version: 38.5.1 Release: 1mamba Summary: Mozilla Thunderbird email, RSS, and newsgroup client Group: Graphical Desktop/Applications/Internet Vendor: openmamba Distribution: openmamba -Packager: Automatic Build System +Packager: Silvan Calarco URL: http://www.mozilla.org/projects/thunderbird/ Source0: http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 # wget ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1/linux-i686/xpi/*.xpi @@ -142,9 +142,8 @@ Because the project is small and tightly managed, bugs targeted to a particular This package contains static libraries and header files need for development. %prep -%setup -q -c -D -T -:<< ___EOF - +%setup -q -c +#-D -T %define _use_internal_dependency_generator 0 %define __find_provides %{_builddir}/thunderbird-%{version}/find_provides.sh @@ -161,11 +160,16 @@ cat > %{_builddir}/thunderbird-%{version}/find_requires.sh <<_EOF #! /bin/sh %{_prefix}/lib/rpm/find-requires %{buildroot} %{_target_cpu} 2>/dev/null | while read line; do - [ ! -f %{buildroot}%{tbdir}/\$line -a ! -f %{buildroot}%{_libdir}/thunderbird-devel-%{majversion}/\$line ] && echo "\$line" +%ifarch x86_64 + sofile="\${line/\(*}" +%endif + [ ! -f %{buildroot}%{tbdir}/\$sofile -a ! -f %{buildroot}%{_libdir}/thunderbird-devel-%{majversion}/\$sofile ] && echo "\$line" done _EOF chmod +x %{_builddir}/thunderbird-%{version}/find_requires.sh +#:<< ___EOF + cd %{source_dir} #%patch0 -p1 @@ -264,8 +268,7 @@ echo "export MOZ_DEBUG_SYMBOLS="1"" >> .mozconfig #__EOF %build -:<< __EOF - +#:<< _EOF cd %{source_dir} ## Disable C++ exceptions since Mozilla code is not exception-safe #MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \ @@ -293,6 +296,9 @@ export MOZILLA_OFFICIAL=1 #export MOZ_PHOENIX="1" make -f client.mk build +# 38.5.0: not a mistake +make -f client.mk build + #\ # NSS_LIBS="`pkg-config --libs nss` -lcrmf" \ # NSS_CFLAGS="`pkg-config --cflags nss`" @@ -1236,6 +1242,9 @@ Chinese (Traditional) language support for Thunderbird. %{tbdir}/extensions/langpack-zh-TW@thunderbird.mozilla.org/ %changelog +* Sat Jan 23 2016 Automatic Build System 38.5.1-1mamba +- automatic version update by autodist + * Fri Nov 27 2015 Automatic Build System 38.4.0-1mamba - automatic version update by autodist