Attachment 11887 Details for Bug 27309 – SPEC diff to update to 2.1.0

[patch] SPEC diff to update to 2.1.0

nicotine.diff (text/plain), 2.59 KB, created by David Walser on 2020-09-22 23:59:51 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: David Walser

Created: 2020-09-22 23:59:51 CEST

Size: 2.59 KB

patch

obsolete

>Index: SPECS/nicotine+.spec
>===================================================================
>--- SPECS/nicotine+.spec	(revision 1629466)
>+++ SPECS/nicotine+.spec	(working copy)
>@@ -5,13 +5,13 @@
> %global appdata_id	org.nicotine_plus.Nicotine
> 
> Name:		nicotine+
>-Version:	2.0.1
>+Version:	2.1.0
> Release:	%mkrel 1
> Summary:	A graphical client for Soulseek
> Group:		Networking/File transfer
> # - 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)
>+# - some icons are Public Domain and LGPLv3+ (see img/README.md)
> 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
>@@ -18,16 +18,17 @@
> Patch1:		0001-Add-AyatanaAppIndicator3-support.patch
> BuildArch:	noarch
> 
>+BuildRequires:	gettext
> BuildRequires:	appstream-util
> BuildRequires:	pkgconfig(python3)
>+BuildRequires:	python3dist(setuptools)
> BuildRequires:	python3dist(pytest)
> 
>-Requires:	gsound
> Requires:	gtk+3
> Requires:	python3dist(dbus-python)
> Requires:	python3dist(miniupnpc)
>-Requires:	python3dist(mutagen)
> Requires:	python3dist(pygobject)
>+Requires:	python3dist(pytaglib)
> Requires:	xdg-utils
> 
> %description
>@@ -48,15 +49,13 @@
> %install
> %py3_install
> 
>-# Remove Windows-only plugins
>-rm -r %{buildroot}%{_datadir}/%{altname}/plugins/np_xmplay_windows/
>-
> # Remove example plugin
>-rm -r %{buildroot}%{_datadir}/%{altname}/plugins/examplars/
>+rm -r %{buildroot}%{_python3_sitelib}/pynicotine/plugins/examplars/
> 
>-# Remove installed documentation files in %%{_defaultdocdir} (contains build
>-# instructions). Useful documentation files are installed using %%doc
>-rm -r %{buildroot}%{_defaultdocdir}/%{altname}/
>+# Remove installed documentation/license files. Useful ones are installed using
>+# %%doc/%%license
>+rm -rf %{buildroot}%{_defaultdocdir}/%{altname}/
>+rm -f %{buildroot}%{python3_sitelib}/pynicotine/*/README.md
> 
> %find_lang %{altname}
> 
>@@ -67,12 +66,11 @@
> 
> 
> %files -f %{altname}.lang
>-%doc AUTHORS.md NEWS README.md doc/TRANSLATORS.md
>-%license COPYING img/README
>+%doc AUTHORS.md NEWS.md README.md doc/TRANSLATORS.md
>+%license COPYING img/CREDITS.md pynicotine/geoip/README.md
> %{_bindir}/%{altname}
> %{python3_sitelib}/pynicotine/
> %{python3_sitelib}/%{altname}-%{version}-py%{python3_version}.egg-info
>-%{_datadir}/%{altname}/
> %{_datadir}/applications/%{appdata_id}.desktop
> %{_iconsdir}/hicolor/*/apps/*.*
> %{_metainfodir}/%{appdata_id}.appdata.xml

Index: SPECS/nicotine+.spec
===================================================================
--- SPECS/nicotine+.spec	(revision 1629466)
+++ SPECS/nicotine+.spec	(working copy)
@@ -5,13 +5,13 @@
 %global appdata_id	org.nicotine_plus.Nicotine
 
 Name:		nicotine+
-Version:	2.0.1
+Version:	2.1.0
 Release:	%mkrel 1
 Summary:	A graphical client for Soulseek
 Group:		Networking/File transfer
 # - 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)
+# - some icons are Public Domain and LGPLv3+ (see img/README.md)
 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
@@ -18,16 +18,17 @@
 Patch1:		0001-Add-AyatanaAppIndicator3-support.patch
 BuildArch:	noarch
 
+BuildRequires:	gettext
 BuildRequires:	appstream-util
 BuildRequires:	pkgconfig(python3)
+BuildRequires:	python3dist(setuptools)
 BuildRequires:	python3dist(pytest)
 
-Requires:	gsound
 Requires:	gtk+3
 Requires:	python3dist(dbus-python)
 Requires:	python3dist(miniupnpc)
-Requires:	python3dist(mutagen)
 Requires:	python3dist(pygobject)
+Requires:	python3dist(pytaglib)
 Requires:	xdg-utils
 
 %description
@@ -48,15 +49,13 @@
 %install
 %py3_install
 
-# Remove Windows-only plugins
-rm -r %{buildroot}%{_datadir}/%{altname}/plugins/np_xmplay_windows/
-
 # Remove example plugin
-rm -r %{buildroot}%{_datadir}/%{altname}/plugins/examplars/
+rm -r %{buildroot}%{_python3_sitelib}/pynicotine/plugins/examplars/
 
-# Remove installed documentation files in %%{_defaultdocdir} (contains build
-# instructions). Useful documentation files are installed using %%doc
-rm -r %{buildroot}%{_defaultdocdir}/%{altname}/
+# Remove installed documentation/license files. Useful ones are installed using
+# %%doc/%%license
+rm -rf %{buildroot}%{_defaultdocdir}/%{altname}/
+rm -f %{buildroot}%{python3_sitelib}/pynicotine/*/README.md
 
 %find_lang %{altname}
 
@@ -67,12 +66,11 @@
 
 
 %files -f %{altname}.lang
-%doc AUTHORS.md NEWS README.md doc/TRANSLATORS.md
-%license COPYING img/README
+%doc AUTHORS.md NEWS.md README.md doc/TRANSLATORS.md
+%license COPYING img/CREDITS.md pynicotine/geoip/README.md
 %{_bindir}/%{altname}
 %{python3_sitelib}/pynicotine/
 %{python3_sitelib}/%{altname}-%{version}-py%{python3_version}.egg-info
-%{_datadir}/%{altname}/
 %{_datadir}/applications/%{appdata_id}.desktop
 %{_iconsdir}/hicolor/*/apps/*.*
 %{_metainfodir}/%{appdata_id}.appdata.xml

Actions: View | Diff

Attachments on bug 27309: 11887