This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from a23b23f x2godesktopsharing.spec: obsolete and provide x2godesktopsharing in x2goserver-desktopsharing. new fce9aba x2godesktopsharing.spec: remove first erroneous Group line. new d2f95d4 x2godesktopsharing.spec: rename other sections to x2goserver-desktopsharing. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2godesktopsharing.spec | 17 ++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit fce9aba57d0ede2ee96211cb9da7c82f3492e83d Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Nov 14 03:10:33 2018 +0100 x2godesktopsharing.spec: remove first erroneous Group line. --- debian/changelog | 1 + x2godesktopsharing.spec | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f40b4ac..4b37c97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium + Fix lrelease-qt5 call (missing number). + Use Qt4 for SLES 11.x builds. + Obsolete and provide x2godesktopsharing in x2goserver-desktopsharing. + + Remove first erroneous Group line. [ Mike Gabriel ] * New upstream version (3.1.1.5): diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec index 4686c04..e9e98d3 100644 --- a/x2godesktopsharing.spec +++ b/x2godesktopsharing.spec @@ -3,7 +3,6 @@ Version: 3.2.0.0 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+ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
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@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