[X2Go-Commits] [x2godesktopsharing] 01/01: x2godesktopsharing.spec: Adapt to building on openSUSE/SLES.
git-admin at x2go.org
git-admin at x2go.org
Wed Oct 15 09:14:18 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2godesktopsharing.
commit 162a178174c174bd542601c69054fe8a801dcfc8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Oct 15 09:14:15 2014 +0200
x2godesktopsharing.spec: Adapt to building on openSUSE/SLES.
---
debian/changelog | 2 ++
x2godesktopsharing.spec | 25 +++++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index ab55fa5..ad72ee9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ x2godesktopsharing (3.1.1.2-0x2go1) UNRELEASED; urgency=low
* New upstream version (3.1.1.2):
- Provide empty translation template for Estonian, Portuguese and
Finnish. Update all .ts files.
+ * x2godesktopsharing.spec:
+ + Adapt to building on openSUSE/SLES.
[ Martti Pitkänen ]
* New upstream version (3.1.1.2):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index be1fe1d..a1fb7b3 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -4,12 +4,32 @@ Release: 0.0x2go1%{?dist}
Summary: Share X11 desktops with other users via X2Go
Group: Applications/Communications
+%if 0%{?suse_version}
+Group: Production/Networking/Remote Desktop
+License: GPL-2.0+
+%else
+Group: Applications/Communications
License: GPLv2+
+%endif
URL: http://www.x2go.org
Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz
+Source1: %{name}-rpmlintrc
BuildRequires: desktop-file-utils
+
+%if 0%{?suse_version}
+BuildRequires: libqt4-devel
+%if 0%{?suse_version} >= 1310
+BuildRequires: libqt4-linguist
+%endif
+%else
+%if 0%{?el5} || 0%{?el6}
BuildRequires: qt4-devel
+%else
+BuildRequires: qt-devel
+%endif
+%endif
+
Requires: hicolor-icon-theme
Requires: x2goserver >= 4.0.0.0
%if 0%{?el5} || 0%{?el6}
@@ -45,8 +65,12 @@ a local X11 session.
%if 0%{?el5}
%{_libdir}/qt4/bin/qmake x2godesktopsharing.pro
%else
+%if 0%{?suse_version}
+qmake x2godesktopsharing.pro
+%else
qmake-qt4 x2godesktopsharing.pro
%endif
+%endif
make %{?_smp_mflags}
@@ -84,6 +108,7 @@ fi
%files
+%defattr(-,root,root)
%doc debian/changelog
%doc debian/copyright
%{_bindir}/%{name}
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
More information about the x2go-commits
mailing list