[X2Go-Commits] [x2goserver] 07/09: x2goserver.spec: correct usage of mime and desktop database upgrade scriptlets and dependencies.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit 4c4731a43b8a723058af724be021623512eadfe3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Mar 5 10:58:44 2017 +0100

    x2goserver.spec: correct usage of mime and desktop database upgrade scriptlets and dependencies.
    
    Fedora mandates to not depend upon shared-mime-info, even not for the
    scriplets.
    
    Additionally, FC24 has deprecated usage of the mime database update
    scriptlet and FC25 has deprecated usage of the desktop database update
    scriptlet.
    
    (Open)SUSE mandates to pull in shared-mime-info and desktop-file-utils
    as post/postun scriptlet dependencies and provides special macros since
    11.4. Older versions are handled via the usual commands.
---
 debian/changelog |  8 ++++++++
 x2goserver.spec  | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 73e2ee2..a832257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,14 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium
   * x2goserver.spec:
     - Add mandatory perl-generators Build-Requires as per
       https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl
+    - Correct usage of mime and desktop database upgrade scriptlets and
+      dependencies. Fedora mandates to not depend upon shared-mime-info, even
+      not for the scriplets. Additionally, FC24 has deprecated usage of the
+      mime database update scriptlet and FC25 has deprecated usage of the
+      desktop database update scriptlet. (Open)SUSE mandates to pull in
+      shared-mime-info and desktop-file-utils as post/postun scriptlet
+      dependencies and provides special macros since 11.4. Older versions are
+      handled via the usual commands.
   * debian/po:
     - Tiny fixup on author name.
   * debian/control:
diff --git a/x2goserver.spec b/x2goserver.spec
index 62c6b10..cdd4a4e 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -312,13 +312,19 @@ Requires:       perl(Cwd)
 %package fmbindings
 Summary:        X2Go Server (file manager bindings)
 Requires:       %{name} = %{version}-%{release}
-%if 0%{?suse_version} || 0%{?suse_version} <= 1130
-Requires(pre): shared-mime-info
+%if 0%{?suse_version}
+%if 0%{?suse_version} <= 1130
+Requires(pre):    shared-mime-info
+%endif
+Requires(post):   shared-mime-info
+Requires(postun): shared-mime-info
+%endif
 %endif
 Requires:       xdg-utils
-Requires:       desktop-file-utils
+%if 0%{?suse_version} || 0%{fedora} < 25 || 0%{?rhel} < 8
 Requires(post):   desktop-file-utils
 Requires(postun): desktop-file-utils
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 Group:          Applications/Communications
 %else
@@ -512,15 +518,37 @@ fi
 
 
 %post fmbindings
-/usr/bin/update-mime-database /usr/share/mime &1>/dev/null 2>/dev/null|| :
+%if 0%{?suse_version} >= 1140
+%mime_database_post
+%desktop_database_post
+%elif 0%{?suse_version} || 0%{fedora} < 24 || 0%{?rhel} < 8
+/usr/bin/update-mime-database %{_datadir}/mime &1>/dev/null 2>/dev/null || :
 /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || :
+%elif 0%{?fedora} < 25
+/usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || :
+# FC 24 and higher have deprecated the mime database update scriptlet and handle changes transparently.
+# FC 25 and higher have deprecated the desktop database update scriptlet and handle changes transparently.
+%endif
 
 %postun fmbindings
 if [ $1 -eq 0 ] ; then
-        /usr/bin/update-mime-database /usr/share/mime &1>/dev/null 2>/dev/null || :
+%if 0%{?suse_version} >= 1140
+        %mime_database_postun
+        %desktop_database_postun
+%elif 0%{?suse_version} || 0%{fedora} < 24 || 0%{?rhel} < 8
+        /usr/bin/update-mime-database %{_datadir}/mime &1>/dev/null 2>/dev/null || :
+        /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || :
+%elif 0%{?fedora} < 25
         /usr/bin/update-desktop-database &1>/dev/null 2>/dev/null || :
+        # Check the post scriptlet for more information.
+%endif
 fi
 
+%posttrans
+%if 0%{?fedora} < 24 || 0%{?rhel} < 8
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+%endif
+
 
 %pre printing
 if ! getent group x2goprint 1>/dev/null; then

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git