diff --git a/.gitignore b/.gitignore index 5562942..0f2e903 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ gajim-0.13.4.tar.bz2 /gajim-0.16.7.tar.bz2 /gajim-0.16.8.tar.bz2 /gajim-0.16.9.tar.bz2 +/gajim-1.0.0.tar.bz2 diff --git a/gajim.spec b/gajim.spec index adc787a..567966e 100644 --- a/gajim.spec +++ b/gajim.spec @@ -1,69 +1,70 @@ +%global appid org.gajim.Gajim + Summary: Jabber client written in PyGTK Name: gajim -%global majorver 0.16 -#global prever -rcX -Version: 0.16.9 -Release: 4%{?dist} +%global majorver 1.0 +Version: 1.0.0 +Release: 1%{?dist} License: GPLv3 URL: https://gajim.org/ -Source0: https://gajim.org/downloads/%{majorver}/%{name}-%{version}%{?prever}.tar.bz2 +Source0: https://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2 BuildArch: noarch ## Hard requirements -Requires: pygobject2 -Requires: pygtk2 -Requires: python2-nbxmpp >= 0.6.0 +Requires: python3-gobject +Requires: gtk3 +Requires: python3-nbxmpp >= 0.6.4 Requires: hicolor-icon-theme -## Optional, but highly recommended -# Secure connection to server -Requires: python2-pyOpenSSL -# Certificate verification -Requires: python2-pyasn1 -# End to End message encryption -Requires: python2-crypto +Requires: python3-pyOpenSSL +Requires: python3-pyasn1 ## Optional, but not too big and not worth exploding the test matrix for # For gajim-remote, desktop notifications, logind, NetworkManager, ... -Requires: dbus-python -# Async DNS resolver (though Gajim has a fallback: spawn 'host' or 'nslookup') -Requires: python-libasyncns +Requires: python3-dbus # For downloading images via proxy or OAUTH2 authentication via proxy -Requires: python2-pycurl -## Optional -# Play event sounds -Recommends: /usr/bin/paplay +Requires: python3-pycurl +## Optional, roughly in the order listed in upstream README.md +# webp avatars +Recommends: python3-pillow +# End to end encryption +Recommends: python3-crypto +# OpenPGP message encryption - Encrypting chat messages with OpenPGP keys +Recommends: python3-gnupg +# Bonjour / Zeroconf - Serverless chatting with autodetected clients in a local network +Recommends: python3-avahi +# Spell checker - Spellchecking of composed messages +Recommends: gspell # Password encryption - Passwords can be stored securely and not just in plaintext -Recommends: gnome-python2-gnomekeyring +Recommends: python3-keyring +Recommends: libsecret +# Audio / Video - Ability to start audio and video chat +Recommends: farstream02 +Recommends: gstreamer1 +Recommends: gstreamer1-plugins-base # UPnP-IGD - Ability to request your router to forward port for file transfer -Recommends: gupnp-igd-python +Recommends: gupnp-igd +# not needed? gajim now uses Gio.NetworkMonitor +#Recommends: NetworkManager-glib +# sharing location +Recommends: geoclue2-libs +# correctly parsing JIDs +Recommends: python3-idna +# XXX python3-precis-i18n # Desktop notifications (Gajim uses org.freedesktop.Notifications interface) # XXX This just pulls in a random desktop environment implementing the notify interface # (e.g. cinnamon). Even as a weak dependency this is useless. #Recommends: desktop-notification-daemon -# XXX Even with libasyncns Gajim still wants to see nslookup in PATH in order to -# show the SRV feature as supported. This may be an upstream bug. -Recommends: /usr/bin/nslookup -# Bonjour / Zeroconf - Serverless chatting with autodetected clients in a local network -Recommends: python2-avahi -# OpenPGP message encryption - Encrypting chat messages with OpenPGP keys -Recommends: python2-gnupg # Automatic status - Ability to measure idle time, in order to set auto status (lib dlopened using ctypes) +# XXX what about wayland? Recommends: libXScrnSaver -# Spell checker - Spellchecking of composed messages (lib dlopened using ctypes) -Recommends: gtkspell # RST generator - Generate XHTML output from RST code -Recommends: python2-docutils -# Audio / Video - Ability to start audio and video chat -# XXX farstream-python was last available in F25. -# Only Gajim's upstream master branch uses farstream02. -Recommends: farstream-python -Recommends: gstreamer-python -Recommends: gstreamer-rtsp-python -Recommends: libnice-gstreamer - -BuildRequires: python2-devel -BuildRequires: desktop-file-utils +Recommends: python3-docutils +# Play event sounds +Recommends: /usr/bin/paplay + +BuildRequires: python3-devel BuildRequires: intltool -BuildRequires: hardlink +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib %description Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is @@ -71,46 +72,43 @@ to provide a full featured and easy to use xmpp client for the GTK+ users. Gajim does not require GNOME to run, even though it exists with it nicely. %prep -%autosetup -p1 -n %{name}-%{version}%{?prever} +%autosetup -p1 %build -%configure --docdir=%{_pkgdocdir} PYTHON=/usr/bin/python2 - -make %{?_smp_mflags} +# Cannot use the py3_build/py3_install macros. +# Gajim's setup.py skips installing some files when "--skip-build" is used. +#py3_build %install -make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT -hardlink -vv $RPM_BUILD_ROOT/%{_bindir} +python3 setup.py install -O1 --root %{buildroot} -desktop-file-install --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --remove-category=Application \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +desktop-file-validate %{buildroot}/%{_datadir}/applications/%{appid}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{appid}.appdata.xml %find_lang %{name} %files -f %{name}.lang %license COPYING -%doc AUTHORS -%doc ChangeLog %doc %{_mandir}/man1/%{name}.1* %doc %{_mandir}/man1/%{name}-history-manager.1* %doc %{_mandir}/man1/%{name}-remote.1* %{_bindir}/%{name} %{_bindir}/%{name}-history-manager %{_bindir}/%{name}-remote -%{_datadir}/applications/%{name}.desktop -%{_datadir}/applications/%{name}-remote.desktop -%{_datadir}/icons/hicolor/*x*/apps/%{name}.png -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/applications/%{appid}.desktop +%{_datadir}/metainfo/%{appid}.appdata.xml +%{_datadir}/icons/hicolor/*x*/apps/%{appid}.png +%{_datadir}/icons/hicolor/scalable/apps/%{appid}.svg +%{_datadir}/icons/hicolor/symbolic/apps/%{appid}-symbolic.svg -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/data -%{_datadir}/%{name}/icons -%{_datadir}/%{name}/plugins -%{_datadir}/%{name}/src +%{python3_sitelib}/%{name} +%{python3_sitelib}/%{name}-%{version}*.egg-info %changelog +* Mon Mar 19 2018 Michal Schmidt - 1.0.0-1 +- Upstream release 1.0.0 +- now using Python3, GTK3. + * Wed Feb 07 2018 Fedora Release Engineering - 0.16.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index aef3d4f..918586e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gajim-0.16.9.tar.bz2) = d8ddae3826bbcd4458b016b3cf6b0472b41db4b9026b300b058d9cef403195e38423ff950fcbf6fed0cdbbb485a274905a9a5945028c4cbb24d1a38c72bf4cbb +SHA512 (gajim-1.0.0.tar.bz2) = b11a2240ecff1fa02cfe361bc2b194aba2711ea743dfb309763fff5241878688839ec8a7b75a3565ae1c3b66c590fb5885bf56add40b7483ed8fdc7666edd15d