Hi Jon,
Firefox
I fixed the desktop-file-utils setting to be 0.3
I added bookmarks, and re-arranged a bit, hopefully in a logical manner.
I added a changelog entry
I am currently recompiling, expect 2 hours.
Thunderbird
Commented out the %post and %postun scripts
I added a changelog entry
I am currently waiting for firefox to recompile before starting.
Troy
Troy Dawson wrote:
> Jon Peatfield wrote:
>> On Wed, 2 Aug 2006, Troy Dawson wrote:
>>
>>> Hello,
>>> Since I haven't heard any real negative feedback from anyone, I am
>>> assuming that the firefox's I posted is going to work.
>>
>> Apologies for the lack of feedback earlier. I got distracted by a
>> 'broken' samba config and a printer needing to be moved ~0.5 miles...
>>
>> Can we have a %changelog entry to show (roughly) what was done from
>> the Vendors version?
>>
>>> I now have my finished rpm's based on a combination of both Jarek and
>>> Stephan's spec files. It makes the changes that Jarek said, so it's
>>> basically like firefox-1.5.0.5-0.SL3.1, but instead of changing the
>>> files directly, all the changes are in the spec file using the 'sed'
>>> command that Stephan did.
>>> I also have the recompiled thunderbird, with the thunderbird.desktop
>>> fix.
>>>
>>> I would like people to test them and give me a thumbs up or down. If
>>> everything is ok, I'd like to get them into errata tomorrow or friday.
>>>
>>> Firefox:
>>> i386
>>> ftp://ftp.scientificlinux.org/linux/scientific/30rolling/testing/i386/RPMS/firefox/firefox-1.5.0.5-0.SL3.3.i386.rpm
>>>
>>
>> This one has the old dependency on 'desktop-file-utils >= 0.9'
>>
>> Diffing the specs from -1 and -3 (since they seem to have the smaller
>> diff) I see:
>>
>
> Ugg ... yep ... and that's why I want them tested.
> Thanks for that
>
>> @@ -1,5 +1,6 @@
>> %define indexhtml file:///usr/share/doc/HTML/index.html
>> -%define desktop_file_utils_version 0.3
>> +%define desktop_file_utils_version 0.9
>> +%define distro SL3
>>
>> %define official_branding 1
>> ExcludeArch: ppc64
>> @@ -7,7 +8,7 @@
>> Summary: Mozilla Firefox Web browser.
>> Name: firefox
>> Version: 1.5.0.5
>> -Release: 0.SL3.1
>> +Release: 0.%{distro}.3
>> Epoch: 0
>> URL: http://www.mozilla.org/projects/firefox/
>> License: MPL/LGPL
>> @@ -21,7 +22,7 @@
>> Source2: firefox-langpacks-%{version}-20060726.tar.bz2
>> Source10: firefox-mozconfig
>> Source11: firefox-mozconfig-branded
>> -Source12: firefox-redhat-default-bookmarks.html
>> +Source12: firefox-%{distro}-default-bookmarks.html
>> Source13: firefox-redhat-default-prefs.js
>> Source20: firefox.desktop
>> Source21: firefox.sh.in
>> ...
>> <snip>
>>
>> which all looks good apart from the 0.9... (actually I'd leave the
>> original bookmarks file in as well but that is just me :-)
>>
>> Oh can we have ubuntu.com added to the Distros in the default
>> bookmarks please? I get enough complaints from ubuntu users
>> already... :-)
>>
>
> Well, since I have to recompile, sure thing. Anybody else have any?
> Speak within 20 minutes.
>
>> Ignoring that dependency, firefix installs and seems to run. I've not
>> yet tested what will need changing (from the 1.0.8 setup) for our
>> hackery to tweak the default config (tweaking the home, and altering
>> the basic settings etc)...
>>
>> I'll try to have more news shortly.
>>
>> <snip>
>>> Thunderbird:
>>> i386
>>> ftp://ftp.scientificlinux.org/linux/scientific/30rolling/testing/i386/RPMS/thunderbird/thunderbird-1.5.0.5-0.SL3.1.i386.rpm
>>>
>>
>> That doesn't have the %post, %postun scriptlets commented out so on
>> installing I get:
>>
>> ...
>> /var/tmp/rpm-tmp.89937: line 1: update-desktop-database: command not
>> found
>> error: %post(thunderbird-1.5.0.5-0.SL3.1) scriptlet failed, exit
>> status 127
>>
>
> Oh ... they didn't used to have those ... I'll put that in ... er ... I
> mean I'll comment them out.
>
>> Apart from the error tbird seems to install and a trivial test worked.
>> I'm about to test if I can install a GB speeling dictionary (probably
>> a different one than 1.0.8 needed...)
>>
>> -- Jon
>
> Troy
--
__________________________________________________
Troy Dawson [log in to unmask] (630)840-6468
Fermilab ComputingDivision/CSS CSI Group
__________________________________________________
|
