646851 - build slaves not able to build rpms because of old version of desktop-file-utils

Status: RESOLVED FIXED

Description

[John Ford [:jhford] CET/CEST Berlin Time]

Created attachment 523321 [details] [diff] [review]
add the encoding key to the desktop file used by specfile

According to the most recent spec [1] the Encoding desktop file key is deprecated.  Unfortunately, our build slaves are using an old version of desktop-file-utils.  In the meanwhile, adding the encoding key to the desktop file will let us validate the desktop files on centos 5.0 while showing a warning on recent versions of fedora

Error on Centos
/builds/slave/cen-lnx64-rpm-ntly/build/obj-firefox/dist/rpmbuild/SOURCES/firefox.desktop: error: required key "Encoding" not found

Warning on Fedora:
mozilla.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated


I have already filed bug 646764 to add a recent version of the desktop-file-validate program to fix the issue.



[1] http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#deprecated-items

Comment 1

[John Ford [:jhford] CET/CEST Berlin Time]

Created attachment 523342 [details] [diff] [review]
working patch

The last patch was missing some lines because of a bad copy and paste

Comment 2

[John Ford [:jhford] CET/CEST Berlin Time]

Created attachment 523400 [details] [diff] [review]
changeset for cjones to check in

So that Chris can check in this patch.  Thanks Chris!

Comment 3

[Chris Jones [:cjones] inactive; ni?/f?/r? if you need me]

Pushed http://hg.mozilla.org/mozilla-central/rev/400281b76ce4