This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from afceb74 x2goserver.spec: fix RPM spec syntax error in shared-mime-info dependency section. new 3a0d285 x2goserver.spec: fix %{?fedora} macro usage. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + x2goserver.spec | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 3a0d285b225207b3eccbb7b0ec3f27a2fbdc5be3 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Mar 6 12:56:16 2017 +0100 x2goserver.spec: fix %{?fedora} macro usage. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd3c9c4..8844990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -269,6 +269,7 @@ x2goserver (4.0.1.21-0x2go1) UNRELEASED; urgency=medium x2goserver package as well will be impacted. The DEB control file also uses "Suggests" for this. - Fix RPM spec syntax error in shared-mime-info dependency section. + - Fix %{?fedora} macro usage. * debian/po: - Tiny fixup on author name. * debian/control: diff --git a/x2goserver.spec b/x2goserver.spec index 1e052d5..2048e9a 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -459,7 +459,7 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif Requires: xdg-utils -%if 0%{?suse_version} || 0%{fedora} < 25 || 0%{?rhel} < 8 +%if 0%{?suse_version} || 0%{?fedora} < 25 || 0%{?rhel} < 8 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %endif @@ -660,7 +660,7 @@ fi %if 0%{?suse_version} >= 1140 %mime_database_post %desktop_database_post -%elif 0%{?suse_version} || 0%{fedora} < 24 || 0%{?rhel} < 8 +%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 @@ -674,7 +674,7 @@ if [ $1 -eq 0 ] ; then %if 0%{?suse_version} >= 1140 %mime_database_postun %desktop_database_postun -%elif 0%{?suse_version} || 0%{fedora} < 24 || 0%{?rhel} < 8 +%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 -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org