[X2Go-Commits] [x2godesktopsharing] 02/02: x2godesktopsharing.spec: rename other sections to x2goserver-desktopsharing.
git-admin at x2go.org
git-admin at x2go.org
Wed Nov 14 03:11:11 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2godesktopsharing.
commit d2f95d4b22d1f0333203483a9430aad9fc66b594
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Nov 14 03:10:55 2018 +0100
x2godesktopsharing.spec: rename other sections to x2goserver-desktopsharing.
---
debian/changelog | 1 +
x2godesktopsharing.spec | 16 ++++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4b37c97..8c54e07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium
+ Use Qt4 for SLES 11.x builds.
+ Obsolete and provide x2godesktopsharing in x2goserver-desktopsharing.
+ Remove first erroneous Group line.
+ + Rename other sections to x2goserver-desktopsharing.
[ Mike Gabriel ]
* New upstream version (3.1.1.5):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index e9e98d3..756f9fb 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -86,7 +86,7 @@ Group: Applications/Communications
Obsoletes: x2godesktopsharing
Provides: x2godesktopsharing = %{version}-%{release}
-%description
+%description -n x2goserver-desktopsharing
X2Go is a server based computing environment with
- session resuming
- low bandwidth support
@@ -100,11 +100,11 @@ grant other X2Go users access to the current session (shadow session
support). The current session may be an X2Go session itself or simply
a local X11 session.
-%prep
+%prep -n x2goserver-desktopsharing
%setup -q
-%build
+%build -n x2goserver-desktopsharing
%if 0%{?suse_version} && 0%{?suse_version} < 1315
lrelease x2godesktopsharing.pro
qmake QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro
@@ -115,7 +115,7 @@ qmake-qt5 QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=
make %{?_smp_mflags}
-%install
+%install -n x2goserver-desktopsharing
mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go}
cp -p %{name} %{buildroot}%{_bindir}/
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
@@ -134,20 +134,20 @@ cp -rp man %{buildroot}%{_datadir}/
%endif
-%pre
+%pre -n x2ogserver-desktopsharing
# Needed for sharing a desktop with another user
getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing
-%post
+%post -n x2goserver-desktopsharing
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%postun
+%postun -n x2goserver-desktopsharing
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-%posttrans
+%posttrans -n x2goserver-desktopsharing
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
More information about the x2go-commits
mailing list