[hplip] desktop file: remove deprecated Encoding key and Application category

Jiří Popelka jpopelka at fedoraproject.org
Fri Dec 7 14:51:25 UTC 2012


commit 8b254142d451b5607f502597024867cc5763b12c
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Dec 7 15:48:55 2012 +0100

    desktop file: remove deprecated Encoding key and Application category
    
    http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
    http://standards.freedesktop.org/menu-spec/latest/apa.html

 hplip.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/hplip.spec b/hplip.spec
index a34c666..020261a 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.12.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 
@@ -344,12 +344,13 @@ rm -f   %{buildroot}%{_bindir}/foomatic-rip \
 
 mkdir -p %{buildroot}%{_datadir}/applications
 sed -i -e '/^Categories=/d' hplip.desktop
+# Encoding key is deprecated
+sed -i -e '/^Encoding=/d' hplip.desktop
 desktop-file-install --vendor HP                                \
         --dir %{buildroot}%{_datadir}/applications              \
         --add-category System                                   \
         --add-category Settings                                 \
         --add-category HardwareSettings                         \
-        --add-category Application                              \
         hplip.desktop
 
 # Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
@@ -528,6 +529,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Dec 07 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.11-2
+- desktop file: remove deprecated Encoding key and Application category
+
 * Tue Nov 27 2012 Jiri Popelka <jpopelka at redhat.com> 3.12.11-1
 - 3.12.11
 -- release-parport.patch merged upstream


More information about the scm-commits mailing list