[X2Go-Commits] x2gomatebindings.git - master (branch) updated: 0.0.1.1-11-gf60a434

X2Go dev team git-admin at x2go.org
Wed Dec 11 16:42:32 CET 2013


The branch, master has been updated
       via  f60a434d482973d8ad0332a365009d8ddbca959f (commit)
      from  c1bb5025c5df8488e1ad7e1e3cff30e3c823b9c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f60a434d482973d8ad0332a365009d8ddbca959f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 11 16:42:28 2013 +0100

    Link in icons from gnome-icon-theme rather then copying dangling symlinks into the package.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog      |    2 ++
 x2gomatebindings.spec |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1f3f461..faa3535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ x2gomatebindings (0.0.1.2-0~x2go1) UNRELEASED; urgency=low
     + Switch to format 1.0.
   * x2gomatebindings.spec:
     + Add x2gomatebindings.spec for building RPM package.
+    + Link in icons from gnome-icon-theme rather then copying
+      dangling symlinks into the package.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 28 Jul 2013 18:35:22 +0200
 
diff --git a/x2gomatebindings.spec b/x2gomatebindings.spec
index 3cd3bc7..3850084 100644
--- a/x2gomatebindings.spec
+++ b/x2gomatebindings.spec
@@ -8,10 +8,8 @@ URL:            http://www.x2go.org/
 Source0:        http://code.x2go.org/releases/source/%name/%name-%version.tar.gz
 
 BuildRequires:  autoconf >= 2.57, automake >= 1.7.6
-%if 0%{!?fe19} || 0%{!?fe20}
-BuildRequires:  gcc-c++
-%endif
 BuildRequires:  mate-common
+BuildRequires:  gnome-icon-theme
 BuildRequires:  mate-desktop-devel
 BuildRequires:  mate-file-manager-devel
 BuildRequires:  GConf2-devel
@@ -51,7 +49,9 @@ mkdir -p %{buildroot}%{_datadir}/x2go/versions/
 install -p -m 644 VERSION.x2gomatebindings %{buildroot}%{_datadir}/x2go/versions/
 mkdir -p %{buildroot}%{_datadir}/{applications,icons/mate/scalable/mimetypes,mime/packages}
 install -p -m 644 share/applications/*.desktop %{buildroot}%{_datadir}/applications/
-install -p -m 644 share/icons/mate/scalable/mimetypes/*.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/
+ln -s -f %{buildroot}%{_datadir}/icons/gnome-colors-common/scalable/devices/drive-harddisk.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg
+ln -s -f %{buildroot}%{_datadir}/icons/gnome-colors-common/scalable/devices/drive-removable-media.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg
+ln -s -f %{buildroot}%{_datadir}/icons/gnome-colors-common/scalable/devices/drive-optical.svg %{buildroot}%{_datadir}/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg
 install -p -m 644 share/mime/packages/*.xml %{buildroot}%{_datadir}/mime/packages/
 mkdir -p %{buildroot}%{_datadir}/x2go/x2gofeature.d/
 install -p -m 644 share/x2go/x2gofeature.d/*.features %{buildroot}%{_datadir}/x2go/x2gofeature.d/


hooks/post-receive
-- 
x2gomatebindings.git (MATE bindings for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gomatebindings.git" (MATE bindings for X2Go).




More information about the x2go-commits mailing list