forked from pool/gajim
Accepting request 1063071 from network
- Update to version 1.7.0. OBS-URL: https://build.opensuse.org/request/show/1063071 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gajim?expand=0&rev=56
This commit is contained in:
commit
6a27b55214
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:dc3f3b3aeffce365aa6da522255d61459155919cd0d761970a945cf05deb28f4
|
|
||||||
size 3703993
|
|
19
gajim-1.7.0-fix-status-switching.patch
Normal file
19
gajim-1.7.0-fix-status-switching.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- a/gajim/common/application.py
|
||||||
|
+++ b/gajim/common/application.py
|
||||||
|
@@ -50,7 +50,6 @@
|
||||||
|
from gajim.common.events import GajimUpdateAvailable
|
||||||
|
from gajim.common.events import SignedIn
|
||||||
|
from gajim.common.helpers import from_one_line
|
||||||
|
-from gajim.common.helpers import get_global_show
|
||||||
|
from gajim.common.helpers import get_random_string
|
||||||
|
from gajim.common.settings import LegacyConfig
|
||||||
|
from gajim.common.settings import Settings
|
||||||
|
@@ -427,8 +426,6 @@ def change_status(self,
|
||||||
|
account: Optional[str] = None
|
||||||
|
) -> None:
|
||||||
|
|
||||||
|
- status = get_global_show()
|
||||||
|
-
|
||||||
|
if account is not None:
|
||||||
|
self._change_status(account, status)
|
||||||
|
return
|
3
gajim-1.7.0.tar.gz
Normal file
3
gajim-1.7.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:7a74c014051278265372441efba019519caed4f813811add32cb16da6a25a481
|
||||||
|
size 3739596
|
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 4 14:57:12 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
|
||||||
|
|
||||||
|
- Update to version 1.7.0:
|
||||||
|
* Port to pyproject.toml.
|
||||||
|
* Preferences: Add 0 and 25 MiB to preview size settings.
|
||||||
|
* Account wizard: Don't allow to add account twice.
|
||||||
|
* Fix loading localised emojis.
|
||||||
|
* HTTPUpload: Don’t cache temp path.
|
||||||
|
* JingleAudio: Always resample audio before processing with
|
||||||
|
webrtcdsp.
|
||||||
|
* Disable legacy ciphers in cryptography.
|
||||||
|
- Add gajim-1.7.0-fix-status-switching.patch: Make switching status
|
||||||
|
work again (commit 3c2c6448).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Jan 14 17:11:58 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
|
Sat Jan 14 17:11:58 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
|
||||||
|
|
||||||
|
67
gajim.spec
67
gajim.spec
@ -18,26 +18,26 @@
|
|||||||
|
|
||||||
%define __requires_exclude ^typelib\\(AppIndicator3\\).*$
|
%define __requires_exclude ^typelib\\(AppIndicator3\\).*$
|
||||||
%if 0%{?suse_version} > 1500
|
%if 0%{?suse_version} > 1500
|
||||||
%define py3ver 3
|
# Build only one time
|
||||||
%define py3pkg python3
|
%define pythons %{primary_python}
|
||||||
%define py3pkg_sitelib %{python3_sitelib}
|
|
||||||
%else
|
%else
|
||||||
# Requires at least python 3.10
|
# Requires at least python 3.10
|
||||||
%define py3ver 3.10
|
%define pythons python310
|
||||||
%define py3pkg python310
|
|
||||||
%define py3pkg_sitelib %{_prefix}/lib/python%{py3ver}/site-packages
|
|
||||||
%endif
|
%endif
|
||||||
Name: gajim
|
Name: gajim
|
||||||
Version: 1.6.1
|
Version: 1.7.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: XMPP client written in Python and Gtk
|
Summary: XMPP client written in Python and Gtk
|
||||||
License: GPL-3.0-only
|
License: GPL-3.0-only
|
||||||
Group: Productivity/Networking/Talk/Clients
|
Group: Productivity/Networking/Talk/Clients
|
||||||
URL: https://gajim.org/
|
URL: https://gajim.org/
|
||||||
Source: https://gajim.org/downloads/1.6/gajim-%{version}.tar.gz
|
Source: https://gajim.org/downloads/1.7/gajim-%{version}.tar.gz
|
||||||
BuildRequires: %{py3pkg}-nbxmpp >= 4.0.1
|
# PATCH-FIX-UPSTREAM gajim-1.7.0-fix-status-switching.patch philipp@hoerist.com -- Make switching status work again (commit 3c2c6448).
|
||||||
BuildRequires: %{py3pkg}-precis-i18n >= 1.0.0
|
Patch0: gajim-1.7.0-fix-status-switching.patch
|
||||||
BuildRequires: %{py3pkg}-setuptools
|
BuildRequires: %{python_module nbxmpp >= 4.0.1}
|
||||||
|
BuildRequires: %{python_module pip}
|
||||||
|
BuildRequires: %{python_module precis-i18n >= 1.0.0}
|
||||||
|
BuildRequires: %{python_module wheel}
|
||||||
BuildRequires: ca-certificates-mozilla
|
BuildRequires: ca-certificates-mozilla
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gobject-introspection-devel
|
BuildRequires: gobject-introspection-devel
|
||||||
@ -45,27 +45,20 @@ BuildRequires: hicolor-icon-theme
|
|||||||
BuildRequires: libpcre1
|
BuildRequires: libpcre1
|
||||||
BuildRequires: p11-kit-devel
|
BuildRequires: p11-kit-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
|
BuildRequires: python-rpm-generators >= 20220912
|
||||||
|
BuildRequires: python-rpm-macros >= 20220912
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
Requires: %{py3pkg}-Pillow
|
Requires: %{python3_dist gssapi}
|
||||||
Requires: %{py3pkg}-base
|
Requires: %{python_flavor}-gobject-Gdk
|
||||||
Requires: %{py3pkg}-cryptography >= 3.4.8
|
Requires: %{python_flavor}-gobject-cairo
|
||||||
Requires: %{py3pkg}-css-parser
|
|
||||||
Requires: %{py3pkg}-gobject-Gdk
|
|
||||||
Requires: %{py3pkg}-gobject-cairo
|
|
||||||
Requires: %{py3pkg}-gssapi
|
|
||||||
Requires: %{py3pkg}-keyring
|
|
||||||
Requires: %{py3pkg}-nbxmpp >= 4.0.1
|
|
||||||
Requires: %{py3pkg}-precis-i18n >= 1.0.0
|
|
||||||
Requires: %{py3pkg}-pycairo >= 1.16.0
|
|
||||||
Requires: ca-certificates-mozilla
|
Requires: ca-certificates-mozilla
|
||||||
Requires: typelib(GtkSource) = 4
|
Requires: typelib(GtkSource) = 4
|
||||||
Requires: typelib(Soup) = 3.0
|
Requires: typelib(Soup) = 3.0
|
||||||
# gajim-remote
|
|
||||||
Recommends: %{py3pkg}-dbus-python
|
|
||||||
# OMEMO encryption
|
# OMEMO encryption
|
||||||
|
Recommends: %{python3_dist axolotl}
|
||||||
Recommends: gajim-plugin-omemo
|
Recommends: gajim-plugin-omemo
|
||||||
Recommends: %{py3pkg}-axolotl
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
%{?python_enable_dependency_generator}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Gajim is a Jabber/XMPP client. It works with MATE and GNOME, but does
|
Gajim is a Jabber/XMPP client. It works with MATE and GNOME, but does
|
||||||
@ -93,20 +86,25 @@ Features:
|
|||||||
%lang_package
|
%lang_package
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
sed -i '/^Keywords/d' data/org.gajim.Gajim.desktop.in
|
sed -i '/^Keywords/d' data/org.gajim.Gajim.desktop.in
|
||||||
sed -i '1{/\/usr\/bin\/*/d;}' gajim/gajim_remote.py
|
sed -i '1{/\/usr\/bin\/*/d;}' gajim/gajim_remote.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
python%{py3ver} setup.py build
|
%pyproject_wheel
|
||||||
|
./pep517build/build_metadata.py -o dist/metadata
|
||||||
|
|
||||||
%install
|
%install
|
||||||
python%{py3ver} setup.py install \
|
%pyproject_install
|
||||||
--root=%{buildroot} --prefix=%{_prefix}
|
./pep517build/install_metadata.py dist/metadata --prefix=%{buildroot}%{_prefix}
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_datadir}/
|
mkdir -p %{buildroot}%{_datadir}/
|
||||||
mv %{buildroot}{%{py3pkg_sitelib}/%{name}/data,%{_datadir}/%{name}}/
|
mv %{buildroot}{%{python_sitelib}/%{name}/data,%{_datadir}/%{name}}/
|
||||||
ln -s %{_datadir}/%{name} %{buildroot}%{py3pkg_sitelib}/%{name}/data
|
ln -s %{_datadir}/%{name} %{buildroot}%{python_sitelib}/%{name}/data
|
||||||
|
|
||||||
|
# Move locales to the system path.
|
||||||
|
mv %{buildroot}%{_datadir}/{%{name}/locale,locale}/
|
||||||
|
ln -s %{_datadir}/locale %{buildroot}%{_datadir}/%{name}/locale
|
||||||
|
|
||||||
# The plugins subdirectory must be owned by the package.
|
# The plugins subdirectory must be owned by the package.
|
||||||
mkdir %{buildroot}%{_datadir}/%{name}/plugins/
|
mkdir %{buildroot}%{_datadir}/%{name}/plugins/
|
||||||
@ -119,8 +117,10 @@ mkdir %{buildroot}%{_datadir}/%{name}/plugins/
|
|||||||
%license COPYING
|
%license COPYING
|
||||||
%{_bindir}/%{name}*
|
%{_bindir}/%{name}*
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/
|
||||||
%{py3pkg_sitelib}/%{name}/
|
# Symlink to /usr/share/locale
|
||||||
%{py3pkg_sitelib}/%{name}-*
|
%exclude %{_datadir}/%{name}/locale
|
||||||
|
%{python_sitelib}/%{name}/
|
||||||
|
%{python_sitelib}/%{name}-*
|
||||||
%{_datadir}/applications/*%{name}*.desktop
|
%{_datadir}/applications/*%{name}*.desktop
|
||||||
%{_datadir}/icons/hicolor/*/apps/*%{name}*.*
|
%{_datadir}/icons/hicolor/*/apps/*%{name}*.*
|
||||||
%dir %{_datadir}/metainfo/
|
%dir %{_datadir}/metainfo/
|
||||||
@ -128,5 +128,6 @@ mkdir %{buildroot}%{_datadir}/%{name}/plugins/
|
|||||||
%{_mandir}/man?/%{name}*%{?ext_man}
|
%{_mandir}/man?/%{name}*%{?ext_man}
|
||||||
|
|
||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
%{_datadir}/%{name}/locale
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user