Add metadata into packages

yast · May 31, 2019 · fc0b6d1 · fc0b6d1
1 parent 0c9aab2
commit fc0b6d1
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 52 deletions.
diff --git a/desktop/yast2-packager.desktop → desktop/org.openSUSE.YaST.Packager.desktop b/desktop/yast2-packager.desktop → desktop/org.openSUSE.YaST.Packager.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Install/Remove Software
-GenericName=Install/Remove Software
+Name=YaST Software
+GenericName=Software Manager
+Comment=Install/Remove Software
 # we cannot use xdg-su -c "/sbin/yast2 sw_single %F"
 # directly here as %F must not be used inside a quoted argument
 # see https://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables

diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 31 19:46:55 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Add metainfo (fate#319035)
+- 4.2.11
+
 -------------------------------------------------------------------
 Thu May 30 12:59:43 UTC 2019 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -12,83 +12,69 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           yast2-packager
-Version:        4.2.10
+Version:        4.2.11
 Release:        0
+Summary:        YaST2 - Package Library
+License:        GPL-2.0-or-later
+Group:          System/YaST
+Url:            https://github.com/yast/yast-packager
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 
-Url:            https://github.com/yast/yast-packager
 BuildRequires:  update-desktop-files
 BuildRequires:  yast2-devtools >= 3.1.10
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:cfa) >= 0.5.0
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:rspec)
 BuildRequires:  rubygem(%{rb_default_ruby_abi}:yast-rake)
-
 # Y2Storage::Device#exists_in_raw_probed
 BuildRequires:  yast2-storage-ng >= 4.0.141
 # break the yast2-packager -> yast2-storage-ng -> yast2-packager build cycle
 #!BuildIgnore: yast2-packager
-
 # Y2Packager::will_be_obsoleted_by
 BuildRequires:  yast2 >= 4.1.68
-
 # Pkg::Resolvables
 BuildRequires:  yast2-pkg-bindings >= 4.2.0
-
 # Augeas lenses
 BuildRequires:  augeas-lenses
 
 # Newly added RPM
 Requires:       yast2-country-data >= 2.16.3
-
 # Pkg::Resolvables
 Requires:       yast2-pkg-bindings >= 4.2.0
-
 # Y2Packager::will_be_obsoleted_by
 Requires:       yast2 >= 4.1.68
-
 # unzipping license file
 Requires:       unzip
-
 # HTTP, FTP, HTTPS modules (inst_productsources.ycp)
 Requires:       yast2-transfer
-
 # XML module (inst_productsources.ycp)
 Requires:       yast2-xml
-
 # Bugzilla #305503 - storing/checking MD5 of licenses
 Requires:       /usr/bin/md5sum
-
 # .process agent
 Requires:       yast2-core >= 2.16.35
-
 # Y2Storage::Device#exists_in_raw_probed
 Requires:       yast2-storage-ng >= 4.0.141
-
 # Augeas lenses
 Requires:       augeas-lenses
-
 # zypp.conf model and minimal modifications (bsc#1023204)
 Requires:       rubygem(%{rb_default_ruby_abi}:cfa) >= 0.5.0
+# One of libyui-qt-pkg, libyui-ncurses-pkg, libyui-gtk-pkg
+Requires:       libyui_pkg
+Requires:       yast2-ruby-bindings >= 1.0.0
 
 # setenv() builtin
 Conflicts:      yast2-core < 2.15.10
-
 # NotEnoughMemory-related functions moved to misc.ycp import-file
 Conflicts:      yast2-add-on < 2.15.15
 
-# One of libyui-qt-pkg, libyui-ncurses-pkg, libyui-gtk-pkg
-Requires:       libyui_pkg
-
 # ensure that 'checkmedia' is on the medium
 Recommends:     checkmedia
-
 # for registering media add-ons on SLE
 # (openSUSE does not contain the registration module)
 %if 0%{?sles_version}
@@ -99,35 +85,23 @@ Recommends:     yast2-registration
 Obsoletes:      yast2-packager-devel-doc
 Obsoletes:      yast2-packager-webpin < %version
 
-Requires:       yast2-ruby-bindings >= 1.0.0
-Summary:        YaST2 - Package Library
-License:        GPL-2.0-or-later
-Group:          System/YaST
-
 %description
 This package contains the libraries and modules for software management.
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
 %check
-rake test:unit
+%yast_check
 
 %build
 
 %install
-rake install DESTDIR="%{buildroot}"
-
+%yast_install
 %suse_update_desktop_file yast2-packager
-
-%post
-%desktop_database_post
-
-%postun
-%desktop_database_postun
+%yast_metainfo
 
 %files
-%defattr(-,root,root)
 %dir %{yast_yncludedir}/checkmedia
 %dir %{yast_yncludedir}/packager
 %dir %{yast_libdir}/packager
@@ -144,6 +118,7 @@ rake install DESTDIR="%{buildroot}"
 %{yast_moduledir}/*
 %{yast_desktopdir}/*.desktop
 %{_datadir}/applications/*.desktop
+%{yast_metainfodir}
 %{yast_scrconfdir}/*
 %{yast_execcompdir}/servers_non_y2/ag_*
 %{yast_icondir}

diff --git a/src/clients/key_manager.rb b/src/clients/key_manager.rb
@@ -58,7 +58,7 @@ def Write
     # main function - start the workflow
     def Main
       Wizard.CreateDialog
-      Wizard.SetDesktopIcon("security")
+      Wizard.SetDesktopIcon("org.openSUSE.YaST.Security")
       # dialog caption
       Wizard.SetContents(_("Initializing..."), Empty(), "", false, true)
 

diff --git a/src/clients/sw_single.rb b/src/clients/sw_single.rb
@@ -490,7 +490,7 @@ def save_known_repositories
     # =============================================================
     def StartSWSingle
       Wizard.CreateDialog
-      Wizard.SetDesktopTitleAndIcon("sw_single")
+      Wizard.SetDesktopTitleAndIcon("org.openSUSE.YaST.SWSingle")
 
       # a stage in the progress dialog
       stages = [

diff --git a/src/desktop/checkmedia.desktop → ...ktop/org.openSUSE.YaST.CheckMedia.desktop b/src/desktop/checkmedia.desktop → ...ktop/org.openSUSE.YaST.CheckMedia.desktop
@@ -19,6 +19,7 @@ X-SuSE-YaST-Keywords=software,media,check,dvd,cd,packages,repositories
 Icon=yast-checkmedia
 Exec=/sbin/yast2 checkmedia
 
-Name=Media Check
-GenericName=Verify CD and DVD media integrity
+Name=YaST Media Check
+GenericName=Media Check
+Comment=Verify CD and DVD media integrity
 StartupNotify=true
diff --git a/src/desktop/sw_single.desktop → ...esktop/org.openSUSE.YaST.SWSingle.desktop b/src/desktop/sw_single.desktop → ...esktop/org.openSUSE.YaST.SWSingle.desktop
@@ -18,6 +18,7 @@ X-SuSE-YaST-Keywords=software,packages,rpm,repositories,installation,deletion
 Icon=yast-sw_single
 Exec=xdg-su -c "/sbin/yast2 sw_single"
 
-Name=Software Management
-GenericName=Install or remove software packages and manage software repositories
+Name=YaST Software Management
+GenericName=Software Management
+Comment=Install or remove software packages and manage software repositories
 StartupNotify=true
diff --git a/src/desktop/sw_source.desktop → ...esktop/org.openSUSE.YaST.SWSource.desktop b/src/desktop/sw_source.desktop → ...esktop/org.openSUSE.YaST.SWSource.desktop
@@ -18,6 +18,7 @@ X-SuSE-YaST-Keywords=software,packages,rpm,repositories
 Icon=yast-sw_source
 Exec=xdg-su -c "/sbin/yast2 repositories"
 
-Name=Software Repositories
-GenericName=Choose the repositories for installation of software packages (CD, network, etc.), add the community repositories
+Name=YaST Software Repositories
+GenericName=Software Repositories
+Comment=Choose the repositories for installation of software packages (CD, network, etc.), add the community repositories
 StartupNotify=true
diff --git a/src/include/checkmedia/ui.rb b/src/include/checkmedia/ui.rb
@@ -571,7 +571,7 @@ def MainSequence
       }
 
       Wizard.CreateDialog
-      Wizard.SetDesktopIcon("checkmedia")
+      Wizard.SetDesktopIcon("org.openSUSE.YaST.CheckMedia")
 
       ret = Sequencer.Run(aliases, sequence)
 

diff --git a/src/lib/packager/clients/repositories.rb b/src/lib/packager/clients/repositories.rb
@@ -1513,15 +1513,15 @@ def StartStoreSource
     # main function - start the workflow
     def StartInstSource
       Wizard.CreateDialog
-      Wizard.SetDesktopIcon("sw_source")
+      Wizard.SetDesktopIcon("org.openSUSE.YaST.SWSource")
 
       if !@full_mode
         # dialog caption
         Wizard.SetContents(_("Initializing..."), Empty(), "", false, true)
         Pkg.TargetInit("/", true)
       end
 
-      Wizard.SetDesktopTitleAndIcon("sw_source")
+      Wizard.SetDesktopTitleAndIcon("org.openSUSE.YaST.SWSource")
 
       # check whether running as root
       if !Confirm.MustBeRoot ||