[X2Go-Commits] [x2goclient] 01/01: x2goclient.spec: Adapt to building for openSUSE/SLES.

git-admin at x2go.org git-admin at x2go.org
Sun Oct 12 20:35:00 CEST 2014


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 76b4011a95ada39474ff0b85655449ac6fc93adf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Oct 12 20:34:55 2014 +0200

    x2goclient.spec: Adapt to building for openSUSE/SLES.
---
 debian/changelog |    2 ++
 x2goclient.spec  |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98e6e48..e96039a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low
     + Add B-D: apache2-dev. On squeeze / lucid builds, this is a superfluous
       B-D, but for later Debian/Ubuntu versions, this smoothes the installation
       of the x2goplugin-provide bin:package.
+  * x2goclient.spec:
+    + Adapt to building for openSUSE/SLES.
 
   [ Oleksandr Shneyder ]
   * New upstream release (4.0.3.0):
diff --git a/x2goclient.spec b/x2goclient.spec
index 7ddde3e..2bfa164 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -10,26 +10,56 @@ Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.
 
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libssh-devel >= 0.4.7
-BuildRequires:  libXpm-devel
-%if 0%{?fedora} || 0%{?el7}
-BuildRequires:  man2html-core
-%else
-BuildRequires:  man
-%endif
-BuildRequires:  openldap-devel
+
+BuildRequires:  openldap2-devel
 %if 0%{?el5} || 0%{?el6}
 BuildRequires:  qt4-devel
 %else
 BuildRequires:  qt-devel
 %endif
+
 %if 0%{?fedora} >= 19 || 0%{?rhel} >= 6
 BuildRequires:  qtbrowserplugin-static
 %endif
+
+%if "%{?_vendor}" == "redhat"
+%if 0%{?fedora} || 0%{?el7}
+BuildRequires:  man2html-core
+%else
+BuildRequires:  man
+%endif
+BuildRequires:	libssh-devel >= 0.4.7
+BuildRequires:	libXpm-devel, libX11-devel
+%endif
+
+if "%{?_vendor}" == "suse"
+BuildRequires:	fdupes update-desktop-files
+%if 0%{?suse_version} >= 1130
+BuildRequires:	pkgconfig(libssh) >= 0.4.7
+BuildRequires:	pkgconfig(x11) pkgconfig(xpm) pkgconfig(xproto)
+%endif
+%if 0%{?suse_version} && 0%{?suse_version} < 1130
+BuildRequires:	libssh-devel >= 0.4
+BuildRequires:	xorg-x11-libXpm-devel xorg-x11-proto-devel
+BuildRequires:	xorg-x11-libX11-devel
+%endif
+BuildRequires:	man2html
+%endif
+
 Requires:       hicolor-icon-theme
 Requires:       nxproxy
 Requires:       openssh-clients, openssh-server
 
+%if "%{?_vendor}" == "suse"
+Requires:	terminus-font
+%endif
+%if "%{?_vendor}" == "redhat"
+Requires:	terminus-fonts
+%endif
+%if 0%{?suse_version} >= 1100
+Suggests:	pinentry-x2go
+%endif
+
 %if 0%{?el5}
 # For compatibility with EPEL5
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -122,6 +152,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 ln -s ../../x2go/x2goplugin-apache.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/x2goplugin-provider.conf
 
+if 0%{?suse_version}
+%suse_update_desktop_file -r x2goclient Utility WebUtility
+%fdupes %buildroot
+%endif
+
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 

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


More information about the x2go-commits mailing list