patch to give details about kpackagetool5 --appstream-metainfo calls

epel9
Rex Dieter 9 years ago
parent 58a2d4357d
commit 0cd5e19276

7
.gitignore vendored

@ -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 /kpackage-5.25.0.tar.xz

@ -9,7 +9,7 @@
Name: kf5-%{framework} Name: kf5-%{framework}
Version: 5.25.0 Version: 5.25.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: KDE Frameworks 5 Tier 2 library to load and install packages as plugins Summary: KDE Frameworks 5 Tier 2 library to load and install packages as plugins
License: LGPLv2+ License: LGPLv2+
@ -24,6 +24,10 @@ URL: https://quickgit.kde.org/?p=%{framework}.git
%endif %endif
Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz 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: extra-cmake-modules >= %{version}
BuildRequires: kf5-karchive-devel >= %{version} BuildRequires: kf5-karchive-devel >= %{version}
BuildRequires: kf5-kconfig-devel >= %{version} BuildRequires: kf5-kconfig-devel >= %{version}
@ -108,6 +112,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
%changelog %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 * Mon Aug 08 2016 Daniel Vrátil <dvratil@fedoraproject.org> - 5.25.0-1
- KDE Frameworks 5.25.0 - KDE Frameworks 5.25.0

@ -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}")
Loading…
Cancel
Save