20.04.0, part of release-service now

add .desktop/appstream validation (permissive for now)

.gitignore

@@ -2,3 +2,4 @@
 /kdeconnect-kde-1.3.4.tar.xz
 /kdeconnect-kde-1.3.5.tar.xz
 /kdeconnect-kde-1.4.tar.xz
+/kdeconnect-kde-20.04.0.tar.xz

kde-connect.spec

@@ -2,28 +2,30 @@
 # enable experimental (default off) bluetooth support
 #global bluetooth 1
 
+%global module kdeconnect-kde
+
 Name:           kde-connect
-Version:        1.4
-Release:        2%{?dist}
+Version:        20.04.0
+Release:        1%{?dist}
 License:        GPLv2+
 Summary:        KDE Connect client for communication with smartphones
 
 Url:            https://community.kde.org/KDEConnect
 #Url:            https://cgit.kde.org/kdeconnect-kde.git
-%if 0%{?_git_describe:1}
-# using releaseme:
-# ./tarme.rb kdeconnect-kde --origin trunk --version 0.8
-# then rename accordingly
-Source0:        kdeconnect-kde-%{_git_describe}.tar.xz
+%global revision %(echo %{version} | cut -d. -f3)
+%if %{revision} >= 50
+%global stable unstable
 %else
-Source0:        http://download.kde.org/stable/kdeconnect/%{version}/kdeconnect-kde-%{version}.tar.xz
+%global stable stable
 %endif
+Source0:        http://download.kde.org/%{stable}/release-service/%{version}/src/%{module}-%{version}.tar.xz
 
 # firewalld service definition, see https://bugzilla.redhat.com/show_bug.cgi?id=1257699#c2
 Source2:        kde-connect.xml
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  firewalld-filesystem
+BuildRequires:  libappstream-glib
 BuildRequires:  gcc-c++
 
 BuildRequires:  extra-cmake-modules >= 5.42
@@ -111,7 +113,7 @@ Supplements: (kdeconnectd and nautilus)
 
 
 %prep
-%autosetup -n kdeconnect-kde-%{version} -p1
+%autosetup -n %{module}-%{version} -p1
 
 
 %build
@@ -139,8 +141,10 @@ desktop-file-edit --remove-key=OnlyShowIn %{buildroot}%{_sysconfdir}/xdg/autosta
 
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdeconnect.kcm.desktop
-desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kdeconnect.nonplasma.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.kdeconnect.kcm.appdata.xml ||:
+for i in %{buildroot}%{_datadir}/applications/org.kde.kdeconnect*.desktop ; do
+desktop-file-validate $i ||:
+done
 
 
 %files -f %{name}.lang
@@ -195,6 +199,10 @@ fi
 
 
 %changelog
+* Thu Apr 23 2020 Rex Dieter <rdieter@fedoraproject.org> - 20.04.0-1
+- 20.04.0, part of release-service now
+- add .desktop/appstream validation (permissive for now)
+
 * Mon Mar 30 2020 Rex Dieter <rdieter@fedoraproject.org> - 1.4-2
 - f31+ firewalld already supports kdeconnect
 

sources

@@ -1 +1 @@
-SHA512 (kdeconnect-kde-1.4.tar.xz) = a8a43327b4185579d626978afc11bb0f334f73f7d68fc72090aab3fd14fb1af381061dd5278fb73e63ff2cb5a688f8ec969c097503d751aff48159237aa56cbf
+SHA512 (kdeconnect-kde-20.04.0.tar.xz) = 257ef9ca583e53e252a22aca04e0a182f935ae5d39cd2211e676225f252bb1a29d0d457c700e876f7d4ff0682ebfb6ba042d5eacd7fc75f4e39972ce5ddf65d7

sources.basename

@@ -0,0 +1 @@
+kdeconnect-kde