- Update to 1.0.1 fixing several security flaws.

- Temporarily disable langpacks to workaround startup issues
- Request the correct system colors from gtk
This commit is contained in:
Christopher Aillon 2005-02-25 00:41:25 +00:00
parent 08ceb329a1
commit 78e32f30a4
3 changed files with 35 additions and 27 deletions

View File

@ -5,3 +5,4 @@ firefox-1.0rc1-source.tar.bz2
firefox-gnomestripe-0.1.tar.gz firefox-gnomestripe-0.1.tar.gz
firefox-1.0-source.tar.bz2 firefox-1.0-source.tar.bz2
firefox-1.0-langpacks-3.tar.bz2 firefox-1.0-langpacks-3.tar.bz2
firefox-1.0.1-source.tar.bz2

View File

@ -9,8 +9,8 @@ ExclusiveArch: i386 x86_64 ia64 ppc s390 s390x
Summary: Mozilla Firefox Web browser. Summary: Mozilla Firefox Web browser.
Name: firefox Name: firefox
Version: 1.0 Version: 1.0.1
Release: 8 Release: 1
Epoch: 0 Epoch: 0
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL License: MPL/LGPL
@ -63,6 +63,7 @@ Patch102: mozilla-1.7.3-xptcall-s390.patch
Patch103: firefox-1.0-xptcall-s390.patch Patch103: firefox-1.0-xptcall-s390.patch
Patch104: firefox-1.0-nspr-s390.patch Patch104: firefox-1.0-nspr-s390.patch
Patch105: firefox-1.0-useragent.patch Patch105: firefox-1.0-useragent.patch
Patch106: firefox-1.0-gtk-system-colors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpng-devel, libjpeg-devel BuildRequires: libpng-devel, libjpeg-devel
@ -123,6 +124,7 @@ compliance, performance and portability.
%patch103 -p1 %patch103 -p1
%patch104 -p0 %patch104 -p0
%patch105 -p0 %patch105 -p0
%patch106 -p0
%{__rm} -f .mozconfig %{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig %{__cp} %{SOURCE10} .mozconfig
@ -197,31 +199,31 @@ find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
cd - cd -
# Install language packs # Install language packs
cd $RPM_BUILD_ROOT%{ffdir}/chrome #cd $RPM_BUILD_ROOT%{ffdir}/chrome
mkdir lang # mkdir lang
cd $RPM_BUILD_ROOT%{ffdir}/chrome/lang # cd $RPM_BUILD_ROOT%{ffdir}/chrome/lang
mv ../installed-chrome.txt ./installed-chrome.txt # mv ../installed-chrome.txt ./installed-chrome.txt
tar xvjf %{SOURCE2} # tar xvjf %{SOURCE2}
#
# # Extract jar, modify the homepage, repack
# for i in `ls *.jar`; do
# rm -rf locale
# LANGPACK=`basename $i .jar`
# unzip $LANGPACK.jar
# perl -pi -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" locale/browser-region/region.properties
# rm -rf $LANGPACK.jar
# zip -r -D $LANGPACK.jar locale
# rm -rf locale
# done
#
# mv -v *.jar ..
# cd -
#cd -
# Extract jar, modify the homepage, repack #cat > $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js << EOF
for i in `ls *.jar`; do #pref("general.useragent.locale", "chrome://global/locale/intl.properties");
rm -rf locale #EOF
LANGPACK=`basename $i .jar` #chmod 644 $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js
unzip $LANGPACK.jar
perl -pi -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" locale/browser-region/region.properties
rm -rf $LANGPACK.jar
zip -r -D $LANGPACK.jar locale
rm -rf locale
done
mv -v *.jar ..
cd -
cd -
cat > $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js << EOF
pref("general.useragent.locale", "chrome://global/locale/intl.properties");
EOF
chmod 644 $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js
# another bug fixed by looking at the debian package # another bug fixed by looking at the debian package
@ -309,6 +311,11 @@ fi
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Feb 24 2005 Christopher Aillon <caillon@redhat.com> 0:1.0.1-1
- Update to 1.0.1 fixing several security flaws.
- Temporarily disable langpacks to workaround startup issues (#145806)
- Request the correct system colors from gtk (#143423)
* Tue Dec 28 2004 Christopher Aillon <caillon@redhat.com> 0:1.0-8 * Tue Dec 28 2004 Christopher Aillon <caillon@redhat.com> 0:1.0-8
- Add upstream langpacks - Add upstream langpacks

View File

@ -1,3 +1,3 @@
b628d5f24a49ab15d1943b7d694edd90 firefox-gnomestripe-0.1.tar.gz b628d5f24a49ab15d1943b7d694edd90 firefox-gnomestripe-0.1.tar.gz
49c16a71f4de014ea471be81e46b1da8 firefox-1.0-source.tar.bz2
b742f86f641fd59d52acbb30e206195a firefox-1.0-langpacks-3.tar.bz2 b742f86f641fd59d52acbb30e206195a firefox-1.0-langpacks-3.tar.bz2
ebaea974fea9460ab7050fff76b41cb1 firefox-1.0.1-source.tar.bz2