From 68de5b6590914e49f0b7d28f33de3d98e20c9250e75d3b2e6e0e8cfb44fc0ac1 Mon Sep 17 00:00:00 2001
From: Lars Vogdt <lrupp@suse.com>
Date: Mon, 19 Sep 2011 15:33:03 +0000
Subject: [PATCH] Accepting request 82656 from KDE:Distro:Factory

- Added %kde4_runtime_requires macro (fix for RPMLINT warning)
- Fixed self-obsoletes (fix for RPMLINT warning)
- Cleaned up spec file formatting (forwarded request 82640 from TheBlackCat) (forwarded request 82641 from TheBlackCat)

OBS-URL: https://build.opensuse.org/request/show/82656
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krusader?expand=0&rev=34
---
 krusader.changes |  7 +++++++
 krusader.spec    | 34 ++++++++++++++++------------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/krusader.changes b/krusader.changes
index 3094dfd..e072024 100644
--- a/krusader.changes
+++ b/krusader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 16 13:00:21 UTC 2011 - toddrme2178@gmail.com
+
+- Added %kde4_runtime_requires macro (fix for RPMLINT warning)
+- Fixed self-obsoletes (fix for RPMLINT warning)
+- Cleaned up spec file formatting
+
 -------------------------------------------------------------------
 Thu Aug 25 08:29:34 UTC 2011 - idonmez@novell.com
 
diff --git a/krusader.spec b/krusader.spec
index 4c43202..2747d2a 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %define jobs $(( `/usr/bin/getconf _NPROCESSORS_ONLN` + 1 ))
 
 Name:           krusader
@@ -33,7 +32,6 @@ Patch2:         krusader-link-solid.patch
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  libkde4-devel
-BuildRequires:  update-desktop-files
 Requires:       kio_iso = %{version}
 Recommends:     %{name}-doc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -47,7 +45,8 @@ License:        GPLv2+
 Summary:        KIO slave to access ISO images
 Group:          System/GUI/KDE
 Provides:       kde4-kio_iso = 1.80.99
-Obsoletes:      kde4-kio_iso <= 1.80.99
+Obsoletes:      kde4-kio_iso < 1.80.99
+%kde4_runtime_requires
 
 %description -n kio_iso
 KIO slave to access ISO images like zip- or tar.gz-archives in your
@@ -82,37 +81,36 @@ export RPM_OPT_FLAGS="%{optflags} -fpermissive"
 pushd build
 %make_install
 popd
+mkdir -p %{buildroot}%{_kde4_servicesdir}/ServiceMenus/
+cp %{SOURCE1} %{buildroot}%{_kde4_servicesdir}/ServiceMenus/
 %suse_update_desktop_file krusader_root-mode FileManager Utility
 %kde_post_install
 %find_lang %{name}
-mkdir -p %{buildroot}%{_kde_share_dir}/services/ServiceMenus/
-cp %{SOURCE1} %{buildroot}%{_kde_share_dir}/services/ServiceMenus/
 %fdupes %{buildroot}
 
-%post -p /sbin/ldconfig
-
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc README AUTHORS COPYING ChangeLog INSTALL TODO SVNNEWS
-%{_bindir}/krusader
-%exclude %{_datadir}/doc/kde/HTML/en/krusader
-%{_kde_share_dir}/apps/krusader
-%{_kde_share_dir}/services/krarc.protocol
+%doc README AUTHORS COPYING ChangeLog TODO SVNNEWS
+%{_kde4_applicationsdir}/krusader*.desktop
+%{_kde4_appsdir}/krusader
+%{_kde4_bindir}/krusader
+%{_kde4_iconsdir}/??color/*/apps/krusader*.png
 %{_kde4_modules}/kio_krarc.so
-%{_datadir}/applications/kde4/krusader*.desktop
-%{_datadir}/icons/??color/*/apps/krusader*.png
+%{_kde4_servicesdir}/krarc.protocol
+%exclude %{_kde4_htmldir}/en/krusader
 
 %files -n kio_iso
 %defattr(-,root,root)
-%config %{_datadir}/kde4/config/kio_isorc
+%config %{_kde4_configdir}/kio_isorc
 %{_kde4_modules}/kio_iso.so*
-%{_kde_share_dir}/services/iso.protocol
-%{_kde_share_dir}/services/ServiceMenus/krusader_browse_iso.desktop
+%{_kde4_servicesdir}/iso.protocol
+%{_kde4_servicesdir}/ServiceMenus/krusader_browse_iso.desktop
 
 %files doc
 %defattr(-,root,root)
-%doc %lang(en) %{_datadir}/doc/kde/HTML/en/krusader
+%doc %lang(en) %{_kde4_htmldir}/en/krusader
 
 %changelog