From 60362666d145567a80ab51120ba61aa264a067b0 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Tue, 4 Jun 2019 09:27:42 +0200 Subject: [PATCH] Add metadata into packages (#127) * Replace GenericName with Comment for descriptions * Add metadata into packages * Revamp spec * Version bump * Change desktop name * Change desktop name * Change yast-builtools/devtools dep version --- package/yast2-update.changes | 8 ++ package/yast2-update.spec | 100 +++++++----------- src/Makefile.am | 2 +- ...sktop => org.opensuse.yast.Update.desktop} | 4 +- 4 files changed, 52 insertions(+), 62 deletions(-) rename src/desktop/{update.desktop => org.opensuse.yast.Update.desktop} (84%) diff --git a/package/yast2-update.changes b/package/yast2-update.changes index a05d8668..500e13aa 100644 --- a/package/yast2-update.changes +++ b/package/yast2-update.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 31 12:42:01 UTC 2019 - Stasiek Michalski + +- Add metainfo (fate#319035) +- Revamp spec +- Replace GenericName with Comment +- 4.2.3 + ------------------------------------------------------------------- Fri Apr 26 11:03:27 UTC 2019 - Ladislav Slezák diff --git a/package/yast2-update.spec b/package/yast2-update.spec index 0da59a09..78d16fe3 100644 --- a/package/yast2-update.spec +++ b/package/yast2-update.spec @@ -12,101 +12,89 @@ # 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-update -Version: 4.2.2 +Version: 4.2.3 Release: 0 +Summary: YaST2 - Update +Group: System/YaST +License: GPL-2.0-only +Url: https://github.com/yast/yast-update -BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0-only -Url: http://github.com/yast/yast-update -BuildRequires: update-desktop-files -BuildRequires: yast2-devtools >= 3.1.15 +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools >= 4.2.2 BuildRequires: yast2-ruby-bindings >= 1.0.0 # Y2Packager::ProductUpgrade.remove_obsolete_upgrades BuildRequires: yast2 >= 4.2.1 # Packages#proposal_for_update BuildRequires: yast2-packager >= 3.2.13 - # xmllint -BuildRequires: libxml2-tools - +BuildRequires: libxml2-tools # control.rng -BuildRequires: yast2-installation-control - +BuildRequires: yast2-installation-control # Needed for tests BuildRequires: rubygem(rspec) - # Encryption.save_crypttab_names -BuildRequires: yast2-storage-ng >= 4.1.31 +BuildRequires: yast2-storage-ng >= 4.1.31 + # Encryption.save_crypttab_names -Requires: yast2-storage-ng >= 4.1.31 +Requires: yast2-storage-ng >= 4.1.31 # Y2Packager::ProductUpgrade.remove_obsolete_upgrades -Requires: yast2 >= 4.2.1 -Requires: yast2-installation - +Requires: yast2 >= 4.2.1 +Requires: yast2-installation # handle bind mount at /mnt/dev -Requires: yast2-packager >= 4.0.61 - +Requires: yast2-packager >= 4.0.61 # Pkg.TargetInitializeOptions() Requires: yast2-pkg-bindings >= 3.1.14 +Requires: yast2-ruby-bindings >= 1.0.0 +# use parallel gzip when crating backup (much faster) +Requires: pigz # moved into yast2-update from yast2-installation # to remove dependency on yast2-storage -Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp +Provides: yast2-installation:/usr/share/YaST2/clients/vendor.ycp # Pkg::PkgUpdateAll (map conf) -Conflicts: yast2-pkg-bindings < 2.15.11 +Conflicts: yast2-pkg-bindings < 2.15.11 # Storage::DeviceMatchFstab (#244117) -Conflicts: yast2-storage < 2.15.4 - -Requires: yast2-ruby-bindings >= 1.0.0 - -# use parallel gzip when crating backup (much faster) -Requires: pigz +Conflicts: yast2-storage < 2.15.4 -Summary: YaST2 - Update +%description +Use this component if you wish to update your system. %package FACTORY -Group: System/YaST -PreReq: %fillup_prereq -Requires: yast2-update yast2 +Summary: YaST2 - Update +Group: System/YaST -# moved into yast2-update from yast2-installation -# to remove dependency on yast2-storage -Provides: yast2-update:/usr/share/YaST2/clients/update.ycp +PreReq: %fillup_prereq +Requires: yast2-update yast2 Requires: yast2-ruby-bindings >= 1.0.0 -Summary: YaST2 - Update - -%description -Use this component if you wish to update your system. +# moved into yast2-update from yast2-installation +# to remove dependency on yast2-storage +Provides: yast2-update:/usr/share/YaST2/clients/update.ycp %description FACTORY Use this component if you wish to update your system. %prep -%setup -n %{name}-%{version} +%setup -q %build %yast_build %install %yast_install - +%yast_metainfo %files -%defattr(-,root,root) -%dir %{yast_moduledir} -%{yast_moduledir}/* - +%{yast_moduledir} %{yast_clientdir}/inst_rootpart.rb %{yast_clientdir}/inst_backup.rb %{yast_clientdir}/rootpart_proposal.rb @@ -115,23 +103,17 @@ Use this component if you wish to update your system. %{yast_clientdir}/backup_proposal.rb %{yast_clientdir}/inst_update_partition.rb %{yast_clientdir}/inst_update_partition_auto.rb - -%dir %{yast_yncludedir} -%{yast_yncludedir}/update -%{yast_yncludedir}/update/rootpart.rb -%{yast_libdir}/update/ -%{yast_libdir}/update/clients -%{yast_libdir}/update/clients/inst_update_partition_auto.rb - +%{yast_yncludedir} +%{yast_libdir} %doc %{yast_docdir} %files FACTORY -%defattr(-,root,root) -%dir %{yast_desktopdir} -%{yast_desktopdir}/update.desktop +%{yast_desktopdir} +%{yast_metainfodir} %{yast_icondir} -%dir %{yast_controldir} -%{yast_controldir}/update.xml +%{yast_controldir} %{yast_clientdir}/update.rb %{yast_clientdir}/run_update.rb %license COPYING + +%changelog diff --git a/src/Makefile.am b/src/Makefile.am index ce5ad9d0..33671475 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ ynclude_DATA = \ include/update/rootpart.rb desktop_DATA = \ - desktop/update.desktop + desktop/org.opensuse.yast.Update.desktop ylibclientdir = "${yast2dir}/lib/update/clients" ylibclient_DATA = \ diff --git a/src/desktop/update.desktop b/src/desktop/org.opensuse.yast.Update.desktop similarity index 84% rename from src/desktop/update.desktop rename to src/desktop/org.opensuse.yast.Update.desktop index 7c9ca97a..9319355c 100644 --- a/src/desktop/update.desktop +++ b/src/desktop/org.opensuse.yast.Update.desktop @@ -18,7 +18,7 @@ X-SuSE-YaST-Keywords=update,packages,factory,rpm Icon=yast-update Exec=xdg-su -c "/sbin/yast2 update" -Name=FACTORY Update -GenericName=Update your system to the newest packages from FACTORY (expert tool) +Name=YaST FACTORY Update +GenericName=FACTORY Update Comment=Update your system to the newest packages from FACTORY (expert tool) StartupNotify=true