[X2Go-Commits] [x2goplasmabindings] 01/03: x2goplasmabindings.spec: rename binary package to plasma5-addons-x2go on *SuSE, keep it plasma-addons-x2go everywhere else.
git-admin at x2go.org
git-admin at x2go.org
Fri Aug 11 19:58:54 CEST 2023
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goplasmabindings.
commit 458033e245a9350e6e2d3809748f54bd76922d09
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Aug 11 19:01:15 2023 +0200
x2goplasmabindings.spec: rename binary package to plasma5-addons-x2go on *SuSE, keep it plasma-addons-x2go everywhere else.
---
debian/changelog | 2 ++
x2goplasmabindings.spec | 16 +++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 67bd98a..6dc6c6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium
+ Fix Plasma 5 detection on OpenSuSE Tumbleweed.
+ Update file list with Plasma 5 files.
+ Add missing qmldir file to Plasma 5 files.
+ + Rename binary package to plasma5-addons-x2go on *SuSE, keep it
+ plasma-addons-x2go everywhere else.
* debian/control:
+ Adapt description to also mention KDE 5.
+ Build-Depend on libkf5plasma-dev and libkf5i18n-dev, with a fallback to
diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec
index 92276e1..26107c5 100644
--- a/x2goplasmabindings.spec
+++ b/x2goplasmabindings.spec
@@ -1,8 +1,10 @@
# Choose between KDE 4 and 5.
%global plasma5 0
+%global my_name plasma-addons-x2go
%if 0%{?suse_version}
%if 0%{?sle_version} >= 150300 || 0%{?suse_version} > 1550
%global plasma5 1
+%global my_name plasma5-addons-x2go
%endif
%endif
%if 0%{?fedora} >= 38
@@ -48,7 +50,7 @@ BuildRequires: cmake(KDeclarative)
%endif
%endif
BuildRequires: intltool
-Requires: plasma-addons-x2go
+Requires: %{my_name}
%if 0%{?fedora} || 0%{?rhel}
# For some reason gcc doesn't depend upon redhat-rpm-config,
@@ -76,14 +78,14 @@ This package adds a plasma widget (KDE4) for controlling your
%endif
X2Go session.
-%package -n plasma-addons-x2go
+%package -n %{my_name}
Summary: Plasma widget for X2Go session control
Group: Applications/Communications
Requires: hicolor-icon-theme
Requires: x2goserver >= 3.1.1.2
Conflicts: plasma-widget-x2go
-%description -n plasma-addons-x2go
+%description -n %{my_name}
X2Go is a server-based computing environment with
- session resuming
- low bandwidth support
@@ -131,20 +133,20 @@ cd build
make install DESTDIR=$RPM_BUILD_ROOT
-%post -n plasma-addons-x2go
+%post -n %{my_name}
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%postun -n plasma-addons-x2go
+%postun -n %{my_name}
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 -n plasma-addons-x2go
+%posttrans -n %{my_name}
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%files -n plasma-addons-x2go
+%files -n %{my_name}
%defattr(-,root,root)
# This will also catch %%{?suse_version} == 0 (i.e., non-SuSE), which is what
# we want. Hopefully.
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git
More information about the x2go-commits
mailing list