diff --git a/.cvsignore b/.cvsignore index 8218a21..4866429 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ firefox-0.9.3-source.tar.bz2 +firefox-1.0PR-source.tar.bz2 diff --git a/firefox.1 b/firefox.1 index e6054c7..2086325 100644 --- a/firefox.1 +++ b/firefox.1 @@ -1,24 +1,24 @@ -.TH MOZILLA-FIREBIRD 1 "August 07, 2001" mozilla-firebird "Linux User's Manual" +.TH FIREFOX 1 "August 07, 2001" firefox "Linux User's Manual" .SH NAME -mozilla-firebird \- a Web browser for X11 derived from the Mozilla browser +firefox \- a Web browser for X11 derived from the Mozilla browser .SH SYNOPSIS -.B mozilla-firebird +.B firefox [\fIOPTIONS\fR] [\fIURL\fR] -.B MozillaFirebird-bin +.B firefox-bin [\fIOPTIONS\fR] [\fIURL\fR] .SH DESCRIPTION -\fBMozilla Firebird\fR is an open-source web browser, designed for +\fBMozilla Firefox\fR is an open-source web browser, designed for standards compliance, performance and portability. .SH USAGE -\fBmozilla-firebird\fR is a simple shell script that will set up the -environment for the actual executable, \fBMozillaFirebird-bin\fR. +\fBfirefox\fR is a simple shell script that will set up the +environment for the actual executable, \fBfirefox-bin\fR. .SH OPTIONS -A summary of the options supported by \fBmozilla-firebird\fR is included below. +A summary of the options supported by \fBfirefox\fR is included below. .SS "GTK options" \fB\-\-gdk-debug=\fR\fIFLAGS\fR @@ -54,7 +54,7 @@ Don't use X shared memory extension .B \-\-g-fatal-warnings Make all warnings fatal -.SS "Mozilla options" +.SS "Firefox options" .TP \fB\-height\fR \fIvalue\fR Set height of startup window to \fIvalue\fR. @@ -69,7 +69,7 @@ Start with 4.x migration window. Set width of startup window to \fIvalue\fR. .TP .B \-v, \-version -Print \fB/usr/bin/mozilla-bin\fR version. +Print \fB/usr/bin/firefox-bin\fR version. .TP \fB\-CreateProfile\fR \fIprofile\fR Create \fIprofile\fR. @@ -90,7 +90,7 @@ Start with profile selection dialog. Start with \fIlang-region\fR resources. .TP \fB\-remote\fR \fIcommand\fR -Execute \fIcommand\fR in an already running Mozilla process. For more info, +Execute \fIcommand\fR in an already running Firefox process. For more info, see: \fIhttp://www.mozilla.org/unix/remote.html\fR .TP .B \-splash @@ -104,14 +104,14 @@ Load the specified chrome. .TP .SH FILES -\fI/usr/bin/mozilla-firebird\fR - shell script wrapping -\fBmozilla-firebird\fR +\fI/usr/bin/firefox\fR - shell script wrapping +\fBfirefox\fR .br -\fI/usr/lib/mozilla/MozillaFirebird-bin\fR - \fBmozilla-firebird\fR +\fI/usr/lib/mozilla/firefox-bin\fR - \fBfirefox\fR executable .SH VERSION -1.3.1 +1.0 .SH BUGS To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR diff --git a/firefox.desktop b/firefox.desktop index 5e80f84..e575262 100644 --- a/firefox.desktop +++ b/firefox.desktop @@ -8,5 +8,4 @@ Exec=firefox Icon=firefox.png Terminal=false Type=Application -Name[en_US]=Mozilla Firefox Browser MimeType=text/html;text/xml;application/xhtml+xml; diff --git a/firefox.spec b/firefox.spec index b29a1da..f507138 100644 --- a/firefox.spec +++ b/firefox.spec @@ -2,13 +2,13 @@ ExclusiveArch: i386 x86_64 ia64 ppc Summary: Mozilla Firefox Web browser. Name: firefox -Version: 0.9.3 -Release: 8 +Version: 0.10.0 +Release: 1.0PR1.0 Epoch: 0 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet -Source0: http://ftp.mozilla.org/pub/firefox/releases/0.9.3/firefox-0.9.3-source.tar.bz2 +Source0: http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10/firefox-1.0PR-source.tar.bz2 Source1: bookmarks.html Source2: mozconfig-firefox Source3: firefox.desktop @@ -19,11 +19,9 @@ Source8: firefox.1 Source9: firefox-rebuild-databases.pl.in Source10: firefox.xpm Patch1: firefox-0.7.3-fedora-homepage.patch -Patch2: firefox-0.7.3-gcc34.patch -Patch3: firefox-0.7.3-extensions.patch -Patch4: firefox-0.7.3-default-plugin-less-annoying.patch -Patch5: firefox-0.7.3-psfonts.patch -Patch6: firefox-0.7.3-freetype-compile.patch +Patch2: firefox-0.7.3-default-plugin-less-annoying.patch +Patch3: firefox-0.7.3-psfonts.patch +Patch4: firefox-0.7.3-freetype-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel, libjpeg-devel BuildRequires: zlib-devel, zip @@ -46,10 +44,8 @@ compliance, performance and portability. %setup -q -n mozilla %patch1 -p1 %patch2 -p1 -%patch3 -p0 -%patch4 -p1 -%patch5 -p1 -%patch6 -p0 +%patch3 -p1 +%patch4 -p0 %{__rm} -f .mozconfig %{__cp} %{SOURCE2} .mozconfig @@ -120,6 +116,9 @@ cd - #--------------------------------------------------------------------- %post + +update-desktop-database %{_datadir}/applications + umask 022 %{ffdir}/firefox-rebuild-databases.pl || : @@ -154,6 +153,13 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Sep 14 2004 Christopher Aillon 0:0.10.0-1.0PR1.0 +- Update to 1.0PR1 +- Update man page references to say Firefox instead of Firebird +- Remove gcc34 and extensions patch; they are now upstream +- Update desktop database +- Minor tweaks to the .desktop file + * Fri Sep 03 2004 Christopher Aillon 0:0.9.3-8 - Fixup .desktop entry Name, GenericName, and Comment (#131602) - Add MimeType desktop entry (patch from jrb@redhat.com) diff --git a/sources b/sources index 1ffc64a..1f34193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -641ebf96d2211b3c5527e88389b9687e firefox-0.9.3-source.tar.bz2 +b81ebc5f01448313add23ed44c47cf5e firefox-1.0PR-source.tar.bz2