[choqok] 1.5

[Rex Dieter]

commit c31834d007a58002f79f41c502804c934c4e3b44
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jan 24 09:00:46 2015 -0600

    1.5

 .gitignore  |    2 +-
 choqok.spec |   26 +++++++++++++++++++-------
 sources     |    2 +-
 3 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 892f676..ea99265 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/choqok-1.4.tar.xz
+/choqok-1.5.tar.xz
diff --git a/choqok.spec b/choqok.spec
index 537ffa4..cf67dd6 100644
--- a/choqok.spec
+++ b/choqok.spec
@@ -1,8 +1,8 @@
 
 Summary: KDE Micro-Blogging Client
 Name: choqok
-Version: 1.4
-Release: 3%{?dist}
+Version: 1.5
+Release: 1%{?dist}
 License: GPLv3
 URL: http://choqok.gnufolks.org/
 %if 0%{?snap:1}
@@ -15,13 +15,19 @@ Source0:  http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel
 BuildRequires: gettext
+%if 0%{?fedora} > 19
+BuildRequires: libappstream-glib
+%endif
 BuildRequires: pkgconfig(libattica)
+# qca2 doesn't appear to be used in code, but CMakeLists.txt checks for it anyway -- rex
+BuildRequires: pkgconfig(qca2)
 BuildRequires: pkgconfig(QJson)
 BuildRequires: pkgconfig(qoauth)
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 # for kwallet, among other goodies
-Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
+%{?kde_runtime_requires}
+%{!?kde_runtime_requires:Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}}
 
 %description
 A Free/Open Source micro-blogging client for K Desktop Environment.
@@ -45,23 +51,25 @@ Requires: kdelibs4-devel
 %prep
 %setup -q 
 
+
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %find_lang %{name} --with-kde
 
+
 %check
+appstream-util validate-relax --nonet %{buildroot}%{datadir}/appdata/choqok.appdata.xml ||:
 desktop-file-validate %{buildroot}%{_kde4_sharedir}/applications/kde4/choqok.desktop
 
-%clean
-rm -rf %{buildroot}
 
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
@@ -75,7 +83,6 @@ fi
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
-
 %files -f %{name}.lang
 %doc COPYING README AUTHORS changelog TODO
 %{_kde4_bindir}/choqok
@@ -84,6 +91,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %{_kde4_libdir}/kde4/konqchoqokplugin.so
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_sharedir}/applications/kde4/choqok.desktop
+%{_datadir}/appdata/choqok.appdata.xml
 %{_kde4_sharedir}/config.kcfg/*.kcfg
 %{_kde4_sharedir}/kde4/services/choqok_*.desktop
 %{_kde4_appsdir}/choqok/
@@ -101,7 +109,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 %{_kde4_libdir}/lib*.so
 %{_kde4_appsdir}/cmake/modules/*.cmake
 
+
 %changelog
+* Sat Jan 24 2015 Rex Dieter <rdieter at fedoraproject.org> 1.5-1
+- 1.5
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 83e0397..efbae4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2efe34ed903b448a21d9233d8033dbdb  choqok-1.4.tar.xz
+f2efdd76199f8276e8ac2f76dc600596  choqok-1.5.tar.xz