diff --git a/.gitignore b/.gitignore index 5f8d5bf..e61c078 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ nicotine+-1.2.15.tar.bz2 /nicotine+-1.2.16-without-nonfree-sounds.tar.bz2 /nicotine+-1.4.1-without-nonfree-sounds.tar.gz +/nicotine+-2.0.1.tar.gz diff --git a/nicotine+-1.4.1-documentation.patch b/nicotine+-1.4.1-documentation.patch deleted file mode 100644 index d9ef778..0000000 --- a/nicotine+-1.4.1-documentation.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up ./pynicotine/gtkgui/frame.py.orig ./pynicotine/gtkgui/frame.py ---- ./pynicotine/gtkgui/frame.py.orig 2017-02-12 13:27:48.000000000 +0100 -+++ ./pynicotine/gtkgui/frame.py 2017-02-13 12:32:56.635437036 +0100 -@@ -2521,6 +2521,9 @@ class NicotineFrame: - - paths.append(os.getcwd()) - -+ path1 = "%s/share/nicotine" % sys.prefix -+ paths.append(path1) -+ - # For distros that puts documentation in /usr/share/doc - path2 = "%s/share/doc/nicotine" % sys.prefix - paths.append(path2) -diff -up ./setup.py.orig ./setup.py ---- ./setup.py.orig 2017-02-12 13:27:48.000000000 +0100 -+++ ./setup.py 2017-02-13 12:32:44.487414755 +0100 -@@ -106,14 +106,14 @@ for sounds in sound_dirs: - ) - - # Documentation --for (path, dirs, docfiles) in os.walk("doc"): -+for (path, dirs, docfiles) in os.walk("doc/NicotinePlusGuide"): - - dst_path = os.sep.join(path.split("/")[1:]) - - for f in docfiles: - files.append( - ( -- os.path.join(sys.prefix, "share/doc/nicotine", dst_path), -+ os.path.join(sys.prefix, "share/nicotine", dst_path), - [os.path.join(path, f)] - ) - ) diff --git a/nicotine+-generate-tarball.sh b/nicotine+-generate-tarball.sh deleted file mode 100644 index 8b9d2a8..0000000 --- a/nicotine+-generate-tarball.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# Regenerate nicotine+ tarball without nonfree sound themes (licensed under CC -# Sampling Plus 1.0) - -VERSION=$1 -SHORT_VERSION=$VERSION -[[ "$VERSION" =~ [a-z0-9]{7,} ]] && SHORT_VERSION=${VERSION:0:7} - -SRC_TARBALL=nicotine+-$SHORT_VERSION.tar.gz -DEST_TARBALL=nicotine+-$SHORT_VERSION-without-nonfree-sounds.tar.gz - -curl -L -R -O https://github.com/Nicotine-plus/nicotine-plus/archive/$VERSION/$SRC_TARBALL -gunzip <$SRC_TARBALL | tar --delete nicotine-plus-$VERSION/sounds | gzip >$DEST_TARBALL -rm $SRC_TARBALL diff --git a/nicotine+.appdata.xml b/nicotine+.appdata.xml deleted file mode 100644 index 529f320..0000000 --- a/nicotine+.appdata.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - nicotine.desktop - CC0-1.0 - GPL-3.0+ - Nicotine+ - A graphical client for the SoulSeek peer-to-peer system - -

- Nicotine+ is a graphical client for the SoulSeek peer-to-peer system. -

-

- Nicotine+ is an attempt to keep Nicotine working with the latest - libraries, kill bugs, keep current with the Soulseek protocol and add some - new features that users want and/or need. -

- - - - http://www.nicotine-plus.org/raw-attachment/wiki/ScreenShots/screenshot_downloads.png - - - http://www.nicotine-plus.org/raw-attachment/wiki/ScreenShots/screenshot_shares.png - - - http://www.nicotine-plus.org/raw-attachment/wiki/ScreenShots/screenshot_search.png - - - http://www.nicotine-plus.org/raw-attachment/wiki/ScreenShots/screenshot_userinfo.png - - - http://www.nicotine-plus.org/raw-attachment/wiki/ScreenShots/screenshot_private.png - - - http://www.nicotine-plus.org/raw-attachment/wiki/ScreenShots/screenshot_chat.png - - - http://www.nicotine-plus.org/ - melmorabity_at_fedoraproject.org - diff --git a/nicotine+.spec b/nicotine+.spec index 6892703..592f8ac 100644 --- a/nicotine+.spec +++ b/nicotine+.spec @@ -1,108 +1,89 @@ %global altname nicotine +%global appdata_id org.nicotine_plus.Nicotine Name: nicotine+ -Version: 1.4.1 -Release: 9%{?dist} -Summary: A graphical client for the SoulSeek peer-to-peer system - -License: GPLv3+ -URL: https://www.nicotine-plus.org/ -Source0: %{name}-%{version}-without-nonfree-sounds.tar.gz -# nicotine+ contains nonfree sounds, licensed under CC Sampling Plus -# 1.0. Therefore we use this script to remove these files before shipping -# it. Invoke this script while in the tarball's directory to retrieve and -# generate a tarball without nonfree bytes -Source1: %{name}-generate-tarball.sh -Source2: %{name}.appdata.xml -# Install user guide, required by application help, outside of %%{_docdir} -Patch0: %{name}-1.4.1-documentation.patch +Version: 2.0.1 +Release: 1%{?dist} +Summary: A graphical client for Soulseek + +# - Notification sound files (in sounds/default/) are CC0 +# - IP2Location Country Database (pynicotine/geoip/ipcountrydb.bin) is CC-BY-SA +# - some icons are Public Domain and LGPLv3+ (see img/README) +License: GPLv3+ and CC0 and CC-BY-SA and Public Domain and LGPLv3+ +URL: https://nicotine-plus.github.io/nicotine-plus/ +Source0: https://github.com/nicotine-plus/nicotine-plus/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils -BuildRequires: gettext BuildRequires: libappstream-glib -BuildRequires: pygobject2 -BuildRequires: python2-devel -Requires: hicolor-icon-theme -Requires: python2-notify -Requires: pygtk2-libglade -Requires: python2-GeoIP -Requires: python2-miniupnpc -Requires: python2-mutagen +BuildRequires: python3-devel +BuildRequires: %{py3_dist pytest} +Requires: %{py3_dist dbus-python} +Requires: %{py3_dist miniupnpc} +Requires: %{py3_dist mutagen} +Requires: %{py3_dist pygobject} +Requires: gobject-introspection%{_isa} +Requires: gsound%{_isa} +Requires: gspell%{_isa} +Requires: gtk3%{_isa} +Requires: libappindicator-gtk3%{_isa} +Requires: libnotify%{_isa} Requires: xdg-utils BuildArch: noarch %description -Nicotine+ is a graphical client for the SoulSeek peer-to-peer system. - -Nicotine+ is an attempt to keep Nicotine working with the latest libraries, kill -bugs, keep current with the Soulseek protocol and add some new features that -users want and/or need. +Nicotine+ is a graphical client for the Soulseek peer-to-peer file sharing +network. It is an attempt to keep Nicotine working with the latest libraries, +kill bugs, keep current with the Soulseek protocol, and add some new features +that users want and/or need. %prep -%autosetup -n nicotine-plus-%{version} -p0 +%autosetup -n nicotine-plus-%{version} + +# Remove bundled egg-info +rm -rf *.egg-info %build -%py2_build +%py3_build %install -%py2_install +%py3_install + +# Remove Windows-only plugins +rm -r $RPM_BUILD_ROOT%{_datadir}/%{altname}/plugins/np_xmplay_windows/ -install -Dpm 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/appdata/%{name}.appdata.xml +# Remove example plugin +rm -r $RPM_BUILD_ROOT%{_datadir}/%{altname}/plugins/examplars/ + +# Remove installed documentation files in %%{_defaultdocdir} (contains build +# instructions). Useful documentation files are installed using %%doc +rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{altname}/ %find_lang %{altname} %check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{altname}.desktop +PYTHONPATH=$RPM_BUILD_ROOT/%{python3_sitelib}/ pytest-%{python3_version} + +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{appdata_id}.desktop +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/%{appdata_id}.appdata.xml -appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml %files -f %{altname}.lang %doc AUTHORS.md NEWS README.md doc/TRANSLATORS.md -%license COPYING -%{_bindir}/* +%license COPYING img/README +%{_bindir}/%{altname} +%{python3_sitelib}/pynicotine/ +%{python3_sitelib}/%{altname}-*.egg-info %{_datadir}/%{altname}/ -%{_datadir}/applications/*.desktop -%{_datadir}/icons/hicolor/*/apps/nicotine-plus.* -%{_datadir}/appdata/*.appdata.xml -%{_mandir}/man1/*.1.gz -%{python2_sitelib}/* +%{_datadir}/applications/%{appdata_id}.desktop +%{_datadir}/icons/hicolor/*/apps/*.* +%{_metainfodir}/%{appdata_id}.appdata.xml +%{_mandir}/man1/%{altname}.1.* %changelog -* Fri Nov 08 2019 Mohamed El Morabity - 1.4.1-9 -- Drop (optional) dependency on python2-libsexy, no longer available in Fedora - -* Thu Jul 25 2019 Fedora Release Engineering - 1.4.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.4.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.4.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 13 2018 Iryna Shcherbina - 1.4.1-5 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Feb 08 2018 Fedora Release Engineering - 1.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 1.4.1-3 -- Remove obsolete scriptlets - -* Wed Jul 26 2017 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon Feb 13 2017 Mohamed El Morabity - 1.4.1-1 -- New upstream -- Update to 1.4.1 -- Spec cleanup -- Add AppData file - -* Fri Feb 10 2017 Fedora Release Engineering - 1.2.16-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Mon Jul 20 2020 Mohamed El Morabity - 2.0.1-1 +- Initial RPM release diff --git a/sources b/sources index c514168..108d2a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nicotine+-1.4.1-without-nonfree-sounds.tar.gz) = 0438248274d80bc19ebd2a2f3b3b7f3db430e79e680108eb9cd787835207fbd57e267fba8fd575a731d3361a8962bb31f1d6739e443273cecb3ef29e842ac2ce +SHA512 (nicotine+-2.0.1.tar.gz) = 0a16c0c289a4f4d54eba773ad40952baadf73333ea4a6b4a4524cc500d007f6de0bdd7a847e3f68978a3247c9bc4a6eab3b77db34605fda79da34c352e89a1b9