This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from f78a992 x2goclient.pro: fix quoting issue in system() call. new 1f97251 debian/changelog: fixup, move x2goclient.spec to own section. new 5e7ccc9 x2goclient.spec: EPEL packages need to depend upon pkgconfig for now, not pkg-config. new 09b10ca x2goclient.spec: pull in redhat-rpm-config manually. new f1c4da4 x2goclient.spec: try to ignore gettext-tools-mini on *SuSE to force installation of the new/renamed gettext-runtime-mini package. The 4 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 | 8 +++++++- x2goclient.spec | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 1f97251b0754db18d82492cd91476736cfd0451a Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 31 08:42:13 2018 +0100 debian/changelog: fixup, move x2goclient.spec to own section. --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index aab4095..251990a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,7 +35,6 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - x2goclient.pro: let static Linux configuration override the new pkgconfig-based libssh usage. - x2goclient.pro: make system a non-variable call. - - x2goclient.spec: build-depend on pkg-config. - x2goclient.pro: fix qmake control flow for libssh logic, we really wanted to use else if for the Windows section and have the general else section being the general fallback. @@ -43,6 +42,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium rules are really weird. * debian/control: - Add build-depend on pkg-config. + * x2goclient.spec: + - Build-depend on pkg-config. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 Jun 2018 00:39:28 +0200 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 5e7ccc9d8f56167f28fabc9433125462bc597349 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 31 08:42:59 2018 +0100 x2goclient.spec: EPEL packages need to depend upon pkgconfig for now, not pkg-config. --- debian/changelog | 1 + x2goclient.spec | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 251990a..1581d92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - Add build-depend on pkg-config. * x2goclient.spec: - Build-depend on pkg-config. + - EPEL packages need to depend upon pkgconfig for now, not pkg-config. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 Jun 2018 00:39:28 +0200 diff --git a/x2goclient.spec b/x2goclient.spec index f60359f..d47e4a8 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -43,7 +43,12 @@ BuildRequires: libssh-devel >= 0.5.5-2.1x2go1 BuildRequires: libXpm-devel, libX11-devel %endif +%if 0%{?el5} || 0%{?el6} || 0%{?el7} +# EPEL still calls the package pkconfig for some reason. +BuildRequires: pkgconfig +%else BuildRequires: pkg-config +%fi %if "%{?_vendor}" == "suse" BuildRequires: fdupes update-desktop-files -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 09b10cad1acf1011d854b727bc7340daa43b3659 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 31 08:46:47 2018 +0100 x2goclient.spec: pull in redhat-rpm-config manually. This should probably be done by something else, like... gcc or qmake or qt(4)-dev, but it isn't. --- debian/changelog | 2 ++ x2goclient.spec | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1581d92..eb9843f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium * x2goclient.spec: - Build-depend on pkg-config. - EPEL packages need to depend upon pkgconfig for now, not pkg-config. + - Pull in redhat-rpm-config manually. This should probably be done by + something else, like... gcc or qmake or qt(4)-dev, but it isn't. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 Jun 2018 00:39:28 +0200 diff --git a/x2goclient.spec b/x2goclient.spec index d47e4a8..53e68fe 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -50,6 +50,14 @@ BuildRequires: pkgconfig BuildRequires: pkg-config %fi +%if 0%{?fedora} || 0%{?rhel} +# For some reason qt(4)-dev doesn't depend upon redhat-rpm-config, +# but the GCC spec file is still used, which leads to gcc failing +# due to a missing annobin plugin during compilation. +# Let's build-depend upon redhat-rpm-config for now manually. +BuildRequires: redhat-rpm-config +%endif + %if "%{?_vendor}" == "suse" BuildRequires: fdupes update-desktop-files %if 0%{?suse_version} >= 1130 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit f1c4da4009628fab44c434f4099dd4a3788e7492 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Oct 31 08:59:35 2018 +0100 x2goclient.spec: try to ignore gettext-tools-mini on *SuSE to force installation of the new/renamed gettext-runtime-mini package. --- debian/changelog | 2 ++ x2goclient.spec | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index eb9843f..3e7c2d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - EPEL packages need to depend upon pkgconfig for now, not pkg-config. - Pull in redhat-rpm-config manually. This should probably be done by something else, like... gcc or qmake or qt(4)-dev, but it isn't. + - Try to ignore gettext-tools-mini on *SuSE to force installation of the + new/renamed gettext-runtime-mini package. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 Jun 2018 00:39:28 +0200 diff --git a/x2goclient.spec b/x2goclient.spec index 53e68fe..29aa50e 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -58,6 +58,12 @@ BuildRequires: pkg-config BuildRequires: redhat-rpm-config %endif +%if 0%{?suse_version} +# gettext-tools-mini were renammed to gettext-runtime-mini, but something +# wants to still pull in the older package, so ignore it. +#!BuildIgnore: gettext-tools-mini +%endif + %if "%{?_vendor}" == "suse" BuildRequires: fdupes update-desktop-files %if 0%{?suse_version} >= 1130 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org