diff --git a/0001-Don-t-hardcode-appdata-location.patch b/0001-Don-t-hardcode-appdata-location.patch new file mode 100644 index 0000000..41b8a3c --- /dev/null +++ b/0001-Don-t-hardcode-appdata-location.patch @@ -0,0 +1,26 @@ +From 84bf36bf7f9f7cbbc5883c7aba405cb5b5d32460 Mon Sep 17 00:00:00 2001 +From: Hrvoje Senjan +Date: Sun, 23 Oct 2016 19:28:08 +0200 +Subject: [PATCH 1/1] Don't hardcode appdata location + +We have a var for that +--- + krusader/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/krusader/CMakeLists.txt b/krusader/CMakeLists.txt +index e3d92cf..c300722 100644 +--- a/krusader/CMakeLists.txt ++++ b/krusader/CMakeLists.txt +@@ -96,7 +96,7 @@ install(FILES midnight_commander.color + splash.png + DESTINATION ${DATA_INSTALL_DIR}/krusader) + install(FILES org.kde.krusader.appdata.xml +- DESTINATION ${SHARE_INSTALL_PREFIX}/appdata) ++ DESTINATION ${KDE_INSTALL_METAINFODIR}) + + ecm_install_icons(ICONS + icons/16-apps-krusader_blue.png +-- +2.10.0 + diff --git a/krusader.changes b/krusader.changes index 18b9968..681c8f2 100644 --- a/krusader.changes +++ b/krusader.changes @@ -47,6 +47,7 @@ Sun Oct 23 17:15:55 UTC 2016 - hrvoje.senjan@gmail.com - Swap krusader-2.4.0-beta2-generate-manpage.patch for krusader-2.5.0-generate-manpage.patch - Drop upstreamed bug309159.patch +- Added 0001-Don-t-hardcode-appdata-location.patch ------------------------------------------------------------------- Tue May 26 11:30:52 UTC 2015 - tchvatal@suse.com diff --git a/krusader.spec b/krusader.spec index 57cdc8e..75d2d84 100644 --- a/krusader.spec +++ b/krusader.spec @@ -22,11 +22,13 @@ Release: 0 Summary: A File Manager License: GPL-2.0+ Group: Productivity/File utilities -Url: http://krusader.sourceforge.net/ +Url: https://krusader.org/ Source: http://download.kde.org/stable/krusader/%{version}/%{name}-%{version}.tar.xz Source1: krusader_browse_iso.desktop # PATCH-FIX-OPENSUSE krusader-2.5.0-generate-manpage.patch -- generate manpage Patch0: krusader-2.5.0-generate-manpage.patch +# PATCH-FIX-UPSTREAM 0001-Don-t-hardcode-appdata-location.patch +Patch1: 0001-Don-t-hardcode-appdata-location.patch BuildRequires: extra-cmake-modules >= 1.1.0 BuildRequires: fdupes BuildRequires: libacl-devel @@ -85,6 +87,7 @@ An advanced twin panel (commander style) file manager for KDE. %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %build export RPM_OPT_FLAGS="%{optflags} -fpermissive" @@ -114,6 +117,8 @@ cp %{SOURCE1} %{buildroot}%{_kf5_servicesdir}/ServiceMenus/ %{_kf5_servicesdir}/krarc.protocol %{_kf5_mandir}/man1/krusader.1.gz %exclude %{_kf5_htmldir}/*/krusader +%dir %{_kf5_appstreamdir} +%{_kf5_appstreamdir}/org.kde.krusader.appdata.xml %files -n kio_iso %defattr(-,root,root) @@ -127,7 +132,6 @@ cp %{SOURCE1} %{buildroot}%{_kf5_servicesdir}/ServiceMenus/ %doc %lang(en) %{_kf5_htmldir}/en/krusader %doc %lang(uk) %{_kf5_htmldir}/uk/krusader %doc %lang(sv) %{_kf5_htmldir}/sv/krusader -%doc %lang(pt) %{_kf5_htmldir}/pt/krusader %doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/krusader %changelog