Merge 2726976 into 3d135f0

yast · Jun 3, 2019 · 245e263 · 245e263
2 parents 3d135f0 + 2726976
commit 245e263
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 36 deletions.
diff --git a/package/yast2-samba-server.changes b/package/yast2-samba-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri May 31 12:38:03 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.0
+
 -------------------------------------------------------------------
 Wed Dec 12 12:47:46 UTC 2018 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-samba-server.spec b/package/yast2-samba-server.spec
@@ -12,20 +12,20 @@
 # 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-samba-server
-Version:        4.1.3
+Version:        4.2.0
 Release:        0
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        %{name}-%{version}.tar.bz2
 Url:            https://github.com/yast/yast-samba-server
-
+Summary:        YaST2 - Samba Server Configuration
 Group:          System/YaST
 License:        GPL-2.0-only
+
+Source0:        %{name}-%{version}.tar.bz2
+
 # Service.Active
 BuildRequires:  libsmbclient-devel
 BuildRequires:  perl-Crypt-SmbHash
@@ -35,55 +35,53 @@ BuildRequires:  samba-client
 BuildRequires:  update-desktop-files
 # Yast2::ServiceWidget
 BuildRequires:  yast2 >= 4.1.0
-BuildRequires:  yast2-devtools >= 3.1.10
+BuildRequires:  yast2-devtools >= 4.2.2
 BuildRequires:  yast2-ldap
 BuildRequires:  yast2-perl-bindings
 BuildRequires:  yast2-samba-client
 BuildRequires:  yast2-testsuite
 BuildRequires:  yast2-users
 
-Requires:	perl-Crypt-SmbHash
+Requires:       perl-Crypt-SmbHash
 # Yast2::ServiceWidget
-Requires:	yast2 >= 4.1.0
-Requires:	yast2-ldap >= 3.1.2
-Requires:	yast2-perl-bindings
-Requires:	yast2-network
+Requires:       yast2 >= 4.1.0
+Requires:       yast2-ldap >= 3.1.2
+Requires:       yast2-perl-bindings
+Requires:       yast2-network
 # samba-client/routines.rb
-Requires:	yast2-samba-client >= 3.1.15
-Requires:	yast2-users
+Requires:       yast2-samba-client >= 3.1.15
+Requires:       yast2-users
+Requires:       yast2-ruby-bindings >= 1.0.0
 
 # bnc #386473, recommend yast2-samba-server when installaing these packages
-Supplements:	samba
-
-BuildArchitectures:	noarch
-
-Requires:       yast2-ruby-bindings >= 1.0.0
+Supplements:    samba
 
-Summary:	YaST2 - Samba Server Configuration
+BuildArch:      noarch
 
 %description
 This package contains the YaST2 component for Samba server
 configuration.
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q
 
 %build
 %yast_build
 
 %install
 %yast_install
-
+%yast_metainfo
 
 %files
-%defattr(-,root,root)
-%dir %{yast_yncludedir}/samba-server
-%{yast_yncludedir}/samba-server/*
-%{yast_ydatadir}/*.rb
-%{yast_clientdir}/*.rb
-%{yast_moduledir}/*
-%{yast_desktopdir}/samba-server.desktop
-%{yast_schemadir}/autoyast/rnc/samba-server.rnc
+%{yast_yncludedir}
+%{yast_ydatadir}
+%{yast_clientdir}
+%{yast_moduledir}
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{yast_schemadir}
 %{yast_icondir}
 %doc %{yast_docdir}
 %license COPYING
+
+%changelog
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -43,7 +43,7 @@ ydata_DATA = \
   data/add_machine.rb
 
 desktop_DATA = \
-  desktop/samba-server.desktop
+  desktop/org.opensuse.yast.SambaServer.desktop
 
 scalabledir = @icondir@/hicolor/scalable/apps
 scalable_DATA = \

diff --git a/src/clients/users_plugin_samba.rb b/src/clients/users_plugin_samba.rb
@@ -192,7 +192,7 @@ def main
         )
 
         Wizard.CreateDialog
-        Wizard.SetDesktopIcon("users")
+        Wizard.SetDesktopIcon("org.opensuse.yast.SambaServer")
 
         # dialog caption
         Wizard.SetContentsButtons(

diff --git a/src/clients/users_plugin_samba_groups.rb b/src/clients/users_plugin_samba_groups.rb
@@ -105,7 +105,7 @@ def main
         )
 
         Wizard.CreateDialog
-        Wizard.SetDesktopIcon("users")
+        Wizard.SetDesktopIcon("org.opensuse.yast.SambaServer")
 
         # dialog caption
         Wizard.SetContentsButtons(

diff --git a/src/desktop/samba-server.desktop → ...top/org.opensuse.yast.SambaServer.desktop b/src/desktop/samba-server.desktop → ...top/org.opensuse.yast.SambaServer.desktop
@@ -21,6 +21,7 @@ X-SuSE-YaST-Keywords=authentication,samba,windows,network
 Icon=yast-samba-server
 Exec=xdg-su -c "/sbin/yast2 samba-server"
 
-Name=Samba Server
-GenericName=Configure a Samba server
+Name=YaST Samba Server
+GenericName=Samba Server
+Comment=Configure a Samba server
 StartupNotify=true
diff --git a/src/include/samba-server/wizards.rb b/src/include/samba-server/wizards.rb
@@ -144,7 +144,7 @@ def SambaServerSequence
       }
 
       Wizard.CreateDialog
-      Wizard.SetDesktopTitleAndIcon("samba-server")
+      Wizard.SetDesktopTitleAndIcon("org.opensuse.yast.SambaServer")
 
       ret = Sequencer.Run(aliases, sequence)