[X2Go-Commits] [x2gomatebindings] 02/02: suse_version >= 1320: Use drive-*.svg from this src:package as they are not present in gnome-colors-common on openSUSE13.2.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gomatebindings.

commit 812c400b84a8b43ac40da0b9e219526361fd21de
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 13 02:34:28 2014 +0100

    suse_version >= 1320: Use drive-*.svg from this src:package as they are not present in gnome-colors-common on openSUSE13.2.
---
 debian/changelog      |    2 ++
 x2gomatebindings.spec |    9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46a43b6..5907b33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ x2gomatebindings (0.0.1.3-0~x2go1) UNRELEASED; urgency=medium
     + Drop from BR: GConf2-devel.
     + Adapt to building on openSUSE/SLES.
     + On openSUSE the icon drive-optical.png is media-optical.png.
+    + suse_version >= 1320: Use drive-*.svg from this src:package as they are
+      not present in gnome-colors-common on openSUSE13.2.
 
   [ Mark Pedersen-Cook ]
   * New upstream version (0.0.1.3):
diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec
index 742a722..13deb9a 100644
--- a/x2gomatebindings.spec
+++ b/x2gomatebindings.spec
@@ -68,11 +68,14 @@ install -p -m 644 VERSION.x2gomatebindings %{buildroot}%{_datadir}/x2go/versions
 mkdir -p %{buildroot}%{_datadir}/{applications,icons/mate/scalable/mimetypes,mime/packages}
 desktop-file-install --dir %{buildroot}%{_datadir}/applications/ share/applications/x2gocaja.desktop
 desktop-file-install --dir %{buildroot}%{_datadir}/applications/ share/applications/x2gosuspend-mate.desktop
+%if 0%{?suse_version} && 0%{?suse_version} >= 1320
+install -p -m 644 share/icons/mate/scalable/mimetypes/drive*.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/
+ln -s -f drive-optical.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg
+ln -s -f drive-harddisk.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg
+ln -s -f drive-removable-media.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg
+%else
 ln -s -f ../../../gnome/scalable/devices/drive-harddisk.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg
 ln -s -f ../../../gnome/scalable/devices/drive-removable-media.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg
-%if 0%{?suse_version}
-ln -s -f ../../../gnome/scalable/devices/media-optical.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg
-%else
 ln -s -f ../../../gnome/scalable/devices/drive-optical.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg
 %endif
 install -p -m 644 share/mime/packages/*.xml %{buildroot}%{_datadir}/mime/packages/

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