This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 81da70c pyhoca-gui.spec: fix pyhoca pulling, we also need to get the directory, not just everything within it. new e922f36 pyhoca-gui.spec: use more modern install macros. new c1f9e55 pyhoca-gui.spec: cherry-pick files in structure even more carefully. 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 ++ pyhoca-gui.spec | 27 ++++++++++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit e922f36174d358f05bf40308412af56cc43ad600 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 15:10:39 2018 +0100 pyhoca-gui.spec: use more modern install macros. --- debian/changelog | 1 + pyhoca-gui.spec | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index e3f44af..21c6746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ pyhoca-gui (0.5.0.8-0x2go1) UNRELEASED; urgency=medium - Pull files out of sitelib more selectively. - Fix pyhoca pulling, we also need to get the directory, not just everything within it. + - Use more modern install macros. -- X2Go Release Manager <git-admin@x2go.org> Sun, 24 Sep 2017 11:28:17 +0200 diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index d884833..10b39c4 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -23,6 +23,9 @@ BuildRequires: python-setuptools BuildRequires: python-distutils-extra BuildRequires: desktop-file-utils BuildRequires: intltool +%if ( 0%{?sle_version} && 0%{?sle_version} >= 120300 && 0%{?is_opensuse} ) || ( 0%{?suse_version} > 1500 ) +BuildRequires: python-rpm-macros +%endif Requires: python-setproctitle Requires: python-x2go >= 0.5.0.0 %if 0%{?suse_version} @@ -67,20 +70,19 @@ notification area and allows multiple X2Go session handling. %build -%if 0%{?fedora} >= 29 %{__python2} setup.py build_i18n %{__python2} setup.py build -%else -%{__python} setup.py build_i18n -%{__python} setup.py build -%endif %install -%if 0%{?fedora} >= 29 -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} +%if 0%{?suse_version} +%if 0%{?sle_version} && ( ( 0%{?sle_version} < 120300 && 0%{?is_opensuse} ) || ( ! 0%{?is_opensuse} ) ) +python2 setup.py install -O1 --skip-build --prefix %{_prefix} --root %{buildroot} +%else +%{python2_install} -O1 +%endif %else -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{py2_install} %endif mkdir -p %{buildroot}%{_bindir}/ cp -p %{name} %{buildroot}%{_bindir}/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit c1f9e55795b9e2c64fd1286c30b4858a15a79261 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Nov 10 15:11:42 2018 +0100 pyhoca-gui.spec: cherry-pick files in structure even more carefully. --- debian/changelog | 1 + pyhoca-gui.spec | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21c6746..73a690b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ pyhoca-gui (0.5.0.8-0x2go1) UNRELEASED; urgency=medium - Fix pyhoca pulling, we also need to get the directory, not just everything within it. - Use more modern install macros. + - Cherry-pick files in structure even more carefully. -- X2Go Release Manager <git-admin@x2go.org> Sun, 24 Sep 2017 11:28:17 +0200 diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index 10b39c4..ab5168d 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -109,13 +109,8 @@ fi %defattr(-,root,root) %doc COPYING README TODO %{_bindir}/%{name} -%if 0%{?fedora} >= 29 -%{python2_sitelib}/PyHoca* -%{python2_sitelib}/pyhoca/ -%else -%{python_sitelib}/PyHoca* -%{python_sitelib}/pyhoca/ -%endif +%{python2_sitelib}/PyHoca_GUI* +%{python2_sitelib}/pyhoca/wxgui/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/PyHoca/ %{_datadir}/pixmaps/pyhoca_x2go-logo-ubuntu.svg -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org