From 4f392d3ab3f683b686b521a211a4e46a6fbb7adbbd8e049f1072c03a9490a0be Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Thu, 25 Aug 2011 12:35:21 +0000
Subject: [PATCH] Accepting request 79726 from KDE:Distro:Factory

- Add krusader-link-solid.patch: explicitly link to solid libs

OBS-URL: https://build.opensuse.org/request/show/79726
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krusader?expand=0&rev=32
---
 krusader-link-solid.patch | 11 +++++++++++
 krusader.changes          |  5 +++++
 krusader.spec             | 27 ++++++++++++++++-----------
 3 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 krusader-link-solid.patch

diff --git a/krusader-link-solid.patch b/krusader-link-solid.patch
new file mode 100644
index 0000000..4047e3b
--- /dev/null
+++ b/krusader-link-solid.patch
@@ -0,0 +1,11 @@
+--- krusader/CMakeLists.txt	2011-08-25 10:28:55.518751729 +0200
++++ krusader/CMakeLists.txt	2011-08-25 10:29:01.490751626 +0200
+@@ -44,7 +44,7 @@
+ 
+ kde4_add_executable(krusader ${krusader_SRCS})
+ 
+-target_link_libraries(krusader BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel Queue VFS Search Splitter Synchronizer UserMenu Locate UserAction ActionMan KViewer Filter Dialogs GUI ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS}  ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} )
++target_link_libraries(krusader BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel Queue VFS Search Splitter Synchronizer UserMenu Locate UserAction ActionMan KViewer Filter Dialogs GUI ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS}  ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} )
+ 
+ install(TARGETS krusader DESTINATION ${BIN_INSTALL_DIR})
+ 
diff --git a/krusader.changes b/krusader.changes
index bd48e82..3094dfd 100644
--- a/krusader.changes
+++ b/krusader.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 25 08:29:34 UTC 2011 - idonmez@novell.com
+
+ - Add krusader-link-solid.patch: explicitly link to solid libs
+
 -------------------------------------------------------------------
 Wed Jun 15 12:04:25 UTC 2011 - coolo@novell.com
 
diff --git a/krusader.spec b/krusader.spec
index 887d1af..0858e80 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %define jobs $(( `/usr/bin/getconf _NPROCESSORS_ONLN` + 1 ))
 
@@ -23,17 +22,21 @@ Name:           krusader
 Version:        2.0.0
 Release:        15
 License:        GPLv2+
-Group:          Productivity/File utilities
+Summary:        A File Manager
 Url:            http://krusader.sourceforge.net/
+Group:          Productivity/File utilities
 Source:         %{name}-%{version}.tar.bz2
 Source1:        krusader_browse_iso.desktop
-Patch:          FIXME.diff
+Patch0:         FIXME.diff
 Patch1:         krusader-gcc44.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  dos2unix fdupes libkde4-devel update-desktop-files
+Patch2:         krusader-link-solid.patch
+BuildRequires:  dos2unix
+BuildRequires:  fdupes
+BuildRequires:  libkde4-devel
+BuildRequires:  update-desktop-files
 Requires:       kio_iso = %{version}
 Recommends:     %{name}-doc
-Summary:        A File Manager
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires
 
 %description
@@ -41,8 +44,8 @@ An advanced twin panel (commander style) file manager for KDE.
 
 %package -n kio_iso
 License:        GPLv2+
-Group:          System/GUI/KDE
 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
 
@@ -52,16 +55,18 @@ file-browser.
 
 %package doc
 License:        GPLv2+
-Group:          Productivity/File utilities
 Summary:        A File Manager
+Group:          Productivity/File utilities
 
 %description doc
 An advanced twin panel (commander style) file manager for KDE.
 
 %prep
 %setup -q
-%patch
+%patch0
 %patch1
+%patch2
+
 mv po/sr\@Latn.po po/sr\@latin.po
 for file in doc/en/*.docbook;
 do
@@ -69,13 +74,13 @@ do
 done
 
 %build
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fpermissive"
+export RPM_OPT_FLAGS="%{optflags} -fpermissive"
 %cmake_kde4 -d build
 %make_jobs
 
 %install
 pushd build
-%makeinstall
+%make_install
 popd
 %suse_update_desktop_file krusader_root-mode FileManager Utility
 %kde_post_install