From 0cd5e19276bf0cdee6f762a79ba069e8b36bda1f Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 25 Aug 2016 12:35:47 -0500
Subject: [PATCH] patch to give details about kpackagetool5
 --appstream-metainfo calls

---
 .gitignore                                |  7 -------
 kf5-kpackage.spec                         |  9 ++++++++-
 kpackage-5.25.0-kpackagetool_status.patch | 11 +++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 kpackage-5.25.0-kpackagetool_status.patch

diff --git a/.gitignore b/.gitignore
index 36dd917..82d3661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-/kpackage-5.18.0.tar.xz
-/kpackage-5.19.0.tar.xz
-/kpackage-5.20.0.tar.xz
-/kpackage-5.21.0.tar.xz
-/kpackage-5.22.0.tar.xz
-/kpackage-5.23.0.tar.xz
-/kpackage-5.24.0.tar.xz
 /kpackage-5.25.0.tar.xz
diff --git a/kf5-kpackage.spec b/kf5-kpackage.spec
index 72ef66e..4b8c42c 100644
--- a/kf5-kpackage.spec
+++ b/kf5-kpackage.spec
@@ -9,7 +9,7 @@
 
 Name:           kf5-%{framework}
 Version:        5.25.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        KDE Frameworks 5 Tier 2 library to load and install packages as plugins
 
 License:        LGPLv2+
@@ -24,6 +24,10 @@ URL:            https://quickgit.kde.org/?p=%{framework}.git
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
+## upstreamable patches
+# give kpackagetool5 --appstream-metainfo calls more detailed output
+Patch50: kpackage-5.25.0-kpackagetool_status.patch
+
 BuildRequires:  extra-cmake-modules >= %{version}
 BuildRequires:  kf5-karchive-devel >= %{version}
 BuildRequires:  kf5-kconfig-devel >= %{version}
@@ -108,6 +112,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 
 
 %changelog
+* Thu Aug 25 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.25.0-2
+- patch to give details about kpackagetool5 --appstream-metainfo calls
+
 * Mon Aug 08 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.25.0-1
 - KDE Frameworks 5.25.0
 
diff --git a/kpackage-5.25.0-kpackagetool_status.patch b/kpackage-5.25.0-kpackagetool_status.patch
new file mode 100644
index 0000000..ce9ee43
--- /dev/null
+++ b/kpackage-5.25.0-kpackagetool_status.patch
@@ -0,0 +1,11 @@
+diff -up kpackage-5.25.0/KF5PackageMacros.cmake.kpackagetool_status kpackage-5.25.0/KF5PackageMacros.cmake
+--- kpackage-5.25.0/KF5PackageMacros.cmake.kpackagetool_status	2016-08-25 12:33:10.905224242 -0500
++++ kpackage-5.25.0/KF5PackageMacros.cmake	2016-08-25 12:28:02.826077416 -0500
+@@ -40,6 +40,7 @@ function(kpackage_install_package dir co
+ 
+    get_target_property(kpackagetool_cmd KF5::kpackagetool5 LOCATION)
+    set(APPDATAFILE "${CMAKE_CURRENT_BINARY_DIR}/${component}.appdata.xml")
++   message(STATUS "${kpackagetool_cmd} --appstream-metainfo ${CMAKE_CURRENT_SOURCE_DIR}/${dir} OUTPUT_FILE ${APPDATAFILE}")
+    execute_process(COMMAND ${kpackagetool_cmd} --appstream-metainfo ${CMAKE_CURRENT_SOURCE_DIR}/${dir} OUTPUT_FILE ${APPDATAFILE} ERROR_VARIABLE appstreamerror RESULT_VARIABLE result)
+    if(appstreamerror)
+         message(WARNING "couldn't generate metainfo for ${component}: ${appstreamerror}")