Merge pull request #21 from hellcp/master

Add metadata into packages
yast · Jun 3, 2019 · f718440 · f718440
2 parents 831e011 + e9aada1
commit f718440
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 32 deletions.
diff --git a/package/yast2-audit-laf.changes b/package/yast2-audit-laf.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 31 12:25:30 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
 -------------------------------------------------------------------
 Tue Dec 11 16:13:51 UTC 2018 - jreidinger@suse.com
 

diff --git a/package/yast2-audit-laf.spec b/package/yast2-audit-laf.spec
@@ -12,61 +12,53 @@
 # 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-audit-laf
-Version:        4.1.1
+Summary:        YaST2 - Configuration of Linux Auditing (LAF)
+Version:        4.2.0
 Release:        0
+Url:            https://github.com/yast/yast-audit-laf
+Group:          System/YaST
+License:        GPL-2.0-only
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 
-Group:	        System/YaST
-License:        GPL-2.0-only
-# Wizard::SetDesktopTitleAndIcon
-Requires:	yast2 >= 2.21.22
-BuildRequires:	perl-XML-Writer update-desktop-files yast2 yast2-testsuite
-BuildRequires:  yast2-devtools >= 3.1.10
-
-BuildArchitectures:	noarch
+BuildRequires:  perl-XML-Writer update-desktop-files yast2 yast2-testsuite
+BuildRequires:  yast2-devtools >= 4.2.2
 
+# Wizard::SetDesktopTitleAndIcon
+Requires:       yast2 >= 2.21.22
 Requires:       yast2-ruby-bindings >= 1.0.0
 
-Summary:	YaST2 - Configuration of Linux Auditing (LAF)
+BuildArch:      noarch
 
 %description
 This module allows the configuration of the audit daemon as well as to
 add rules for the audit subsystem.
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
 %build
 %yast_build
 
 %install
 %yast_install
-
+%yast_metainfo
 
 %files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/audit-laf
-%{yast_yncludedir}/audit-laf/*
-%dir %{yast_clientdir}
-%{yast_clientdir}/audit-laf.rb
-%{yast_clientdir}/audit-laf_*.rb
-%dir %{yast_moduledir}
-%{yast_moduledir}/AuditLaf.*
-%dir %{yast_desktopdir}
-%{yast_desktopdir}/audit-laf.desktop
-%dir %{yast_scrconfdir}
-%{yast_scrconfdir}/auditd.scr
+%{yast_yncludedir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_scrconfdir}
 %doc %{yast_docdir}
 %license COPYING
-%{yast_schemadir}/autoyast/rnc/audit-laf.rnc
+%{yast_schemadir}
 %{yast_icondir}
 
 %changelog
-
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -24,7 +24,7 @@ schemafiles_DATA = \
   autoyast-rnc/audit-laf.rnc
 
 desktop_DATA = \
-  desktop/audit-laf.desktop
+  desktop/org.opensuse.yast.AuditLAF.desktop
 
 symbolicdir = @icondir@/hicolor/symbolic/apps
 symbolic_DATA = \

diff --git a/src/desktop/audit-laf.desktop → ...esktop/org.opensuse.yast.AuditLAF.desktop b/src/desktop/audit-laf.desktop → ...esktop/org.opensuse.yast.AuditLAF.desktop
@@ -21,6 +21,7 @@ X-SuSE-YaST-AutoInstSchema=audit-laf.rnc
 Icon=yast-audit-laf
 Exec=xdg-su -c "/sbin/yast2 audit-laf"
 
-Name=Linux Audit Framework (LAF)
-GenericName=audit-laf
+Name=YaST Audit (LAF)
+GenericName=Linux Audit Framework (LAF)
+Comment=Collect information about the system
 StartupNotify=true
diff --git a/src/include/audit-laf/wizards.rb b/src/include/audit-laf/wizards.rb
@@ -188,7 +188,7 @@ def MainSequence
         Label.FinishButton
       )
       Wizard.DisableBackButton
-      Wizard.SetDesktopTitleAndIcon("audit-laf")
+      Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.AuditLAF")
 
       CWM.Run(w, { :abort => fun_ref(method(:ReallyAbort), "boolean ()") })
     end