commit 17deec44e3c1f4b7e69d20ef1eae6b56d861ee8c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Feb 18 09:44:37 2021 +0000
New upstream release
amule.spec | 55 ++++++++++++++++++++++++++++---------------------------
sources | 2 +-
2 files changed, 29 insertions(+), 28 deletions(-)
---
diff --git a/amule.spec b/amule.spec
index 1c4ded1..431a1ab 100644
--- a/amule.spec
+++ b/amule.spec
@@ -1,13 +1,9 @@
-%global commit 0e9e3efce05c30c916a2d4fdc4fbf1a940efefb4
-%global gitdate 20201122
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
Name: amule
Version: 2.3.3
-Release: 0.9.%{gitdate}git%{shortcommit}%{?dist}
+Release: 1%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
-Source0:
https://github.com/amule-project/amule/archive/%{commit}/%{name}-%{shortc...
+Source0:
https://github.com/amule-project/amule/archive/%{version}/%{name}-%{versi...
Source2: %{name}.appdata.xml
URL:
http://amule.org
BuildRequires: gcc
@@ -28,6 +24,7 @@ BuildRequires: readline-devel
BuildRequires: pkgconfig(cryptopp)
BuildRequires: pkgconfig(libupnp)
BuildRequires: pkgconfig(geoip)
+BuildRequires: libappstream-glib
BuildRequires: libtool
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(ncurses)
@@ -51,7 +48,7 @@ It is useful for servers which don't have Xorg.
%prep
-%setup -q -n %{name}-%{commit}
+%autosetup
%build
# Downgrade to c++14 to avoid conflict with std::byte
@@ -115,6 +112,7 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/INSTALL
rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
install -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml
%files -f %{name}.lang
@@ -129,16 +127,16 @@ install -m 0644 -D %{SOURCE2}
%{buildroot}%{_metainfodir}/%{name}.appdata.xml
%{_datadir}/cas
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*
-%{_mandir}/man1/alc.1.gz
-%{_mandir}/*/man1/alc.1.gz
-%{_mandir}/man1/amule.1.gz
-%{_mandir}/*/man1/amule.1.gz
-%{_mandir}/man1/cas.1.gz
-%{_mandir}/*/man1/cas.1.gz
-%{_mandir}/man1/wxcas.1.gz
-%{_mandir}/*/man1/wxcas.1.gz
-%{_mandir}/man1/amulegui.1.gz
-%{_mandir}/*/man1/amulegui.1.gz
+%{_mandir}/man1/alc.1.*
+%{_mandir}/*/man1/alc.1.*
+%{_mandir}/man1/amule.1.*
+%{_mandir}/*/man1/amule.1.*
+%{_mandir}/man1/cas.1.*
+%{_mandir}/*/man1/cas.1.*
+%{_mandir}/man1/wxcas.1.*
+%{_mandir}/*/man1/wxcas.1.*
+%{_mandir}/man1/amulegui.1.*
+%{_mandir}/*/man1/amulegui.1.*
%exclude %{_datadir}/%{name}/webserver
%{_metainfodir}/%{name}.appdata.xml
@@ -149,19 +147,22 @@ install -m 0644 -D %{SOURCE2}
%{buildroot}%{_metainfodir}/%{name}.appdata.xml
%{_bindir}/amuleweb
%{_bindir}/ed2k
%{_datadir}/%{name}/webserver
-%{_mandir}/man1/alcc.1.gz
-%{_mandir}/*/man1/alcc.1.gz
-%{_mandir}/man1/amulecmd.1.gz
-%{_mandir}/*/man1/amulecmd.1.gz
-%{_mandir}/man1/amuled.1.gz
-%{_mandir}/*/man1/amuled.1.gz
-%{_mandir}/man1/amuleweb.1.gz
-%{_mandir}/*/man1/amuleweb.1.gz
-%{_mandir}/man1/ed2k.1.gz
-%{_mandir}/*/man1/ed2k.1.gz
+%{_mandir}/man1/alcc.1.*
+%{_mandir}/*/man1/alcc.1.*
+%{_mandir}/man1/amulecmd.1.*
+%{_mandir}/*/man1/amulecmd.1.*
+%{_mandir}/man1/amuled.1.*
+%{_mandir}/*/man1/amuled.1.*
+%{_mandir}/man1/amuleweb.1.*
+%{_mandir}/*/man1/amuleweb.1.*
+%{_mandir}/man1/ed2k.1.*
+%{_mandir}/*/man1/ed2k.1.*
%changelog
+* Thu Feb 18 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.3.3-1
+- New upstream release
+
* Thu Feb 11 2021 Nicolas Chauvet <kwizart(a)gmail.com> -
2.3.3-0.9.20201122git0e9e3ef
- Rebuilt
diff --git a/sources b/sources
index df6dee8..c62aef6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (amule-0e9e3ef.tar.gz) =
7325c66102db06a54a11aae845ee5dca462611db0569d0fc7bb63effcbf5216cb45243013301c0035202758de6a6c26628cdfb7febda64e63d8f0c7fe2222d56
+SHA512 (amule-2.3.3.tar.gz) =
ba9c95fda1b78a76d3b363d4426483c3c884a3cc31a56593db4d844d3b0e3f69560a149e02570de018f0c8821ad681c9e167cff93045604be4ba96827d8e2e6d