Merge pull request #95 from hellcp/master

Add metadata into packages
yast · Jun 4, 2019 · 0eaf0b0 · 0eaf0b0
2 parents 15196e9 + 102ac9b
commit 0eaf0b0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 33 deletions.
diff --git a/configure.in.in b/configure.in.in
diff --git a/package/yast2-iscsi-lio-server.changes b/package/yast2-iscsi-lio-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 31 12:31:59 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
 -------------------------------------------------------------------
 Tue Apr  2 12:48:33 UTC 2019 - snwint@suse.com
 

diff --git a/package/yast2-iscsi-lio-server.spec b/package/yast2-iscsi-lio-server.spec
@@ -12,58 +12,56 @@
 # 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-iscsi-lio-server
-Version:        4.1.6
+Version:        4.2.0
 Release:        0
+Summary:        Configuration of iSCSI LIO target
+License:        GPL-2.0-only
+Group:          System/YaST
+Url:            https://github.com/yast/yast-iscsi-lio-server
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 
 BuildRequires:  update-desktop-files
 # Yast2::Execute.stdout
 BuildRequires:  yast2 >= 4.1.42
-BuildRequires:  yast2-devtools >= 3.1.10
+BuildRequires:  yast2-devtools >= 4.2.2
 BuildRequires:  rubygem(%rb_default_ruby_abi:rspec)
 BuildRequires:  rubygem(%rb_default_ruby_abi:yast-rake)
+
 Requires:       python3-configshell-fb
 Requires:       python3-rtslib-fb
 Requires:       python3-targetcli-fb
-
 # Yast2::Execute.stdout
 Requires:       yast2 >= 4.1.42
-
-BuildArch:      noarch
-
 Requires:       yast2-ruby-bindings >= 1.0.0
 
-Summary:        Configuration of iSCSI LIO target
-License:        GPL-2.0-only
-Group:          System/YaST
+BuildArch:      noarch
 
 %description
 This package contains configuration of iSCSI LIO target
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
 %build
 
 %check
-rake test:unit
+%yast_check
 
 %install
-rake install DESTDIR="%{buildroot}"
+%yast_install
+%yast_metainfo
 
 %files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/iscsi-lio-server
-%{yast_yncludedir}/iscsi-lio-server/*
-%{yast_clientdir}/iscsi-lio-server.rb
-%{yast_desktopdir}/iscsi-lio-server.desktop
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_desktopdir}
+%{yast_metainfodir}
 %doc %{yast_docdir}
 %{yast_icondir}
 %license COPYING

diff --git a/src/desktop/iscsi-lio-server.desktop → ...p/org.opensuse.yast.iSCILIOServer.desktop b/src/desktop/iscsi-lio-server.desktop → ...p/org.opensuse.yast.iSCILIOServer.desktop
@@ -18,7 +18,8 @@ X-SuSE-YaST-Keywords=iscsi,lio,network,system
 
 Icon=yast-iscsi-server
 Exec=xdg-su -c "/sbin/yast2 iscsi-lio-server" 
-Name=iSCSI LIO Target
-GenericName=Configure an iSCSI target via LIO
+Name=YaST iSCSI LIO Target
+GenericName=iSCSI LIO Target
+Comment=Configure an iSCSI target via LIO
 X-KDE-SubstituteUID=true
 StartupNotify=true