From: blekot <blekot@pld-linux.org>
Date: Sun, 11 Mar 2007 15:06:11 +0000 (+0000)
Subject: - reverted last commit
X-Git-Tag: auto/th/krusader-1_70_1-2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fkrusader.git;a=commitdiff_plain;h=cedf0ee6c333fb1cd23a3268b8a1fe6d7bf3580d

- reverted last commit
- removed kio_tar.so (conflicts with konqueror)

Changed files:
    krusader.spec -> 1.48
---

diff --git a/krusader.spec b/krusader.spec
index 6560f34..459b3bd 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -21,8 +21,6 @@ URL:		http://krusader.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:  boost-filesystem-devel
-BuildRequires:  boost-regex-devel
 %{?with_libkonq:BuildRequires:	kdebase-devel}
 %{?with_libkjsembed:BuildRequires:	kdebindings-kjsembed-devel}
 BuildRequires:	kdelibs-devel >= 3.5.0-4
@@ -82,12 +80,14 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/krusader.desktop \
 	$RPM_BUILD_ROOT%{_desktopdir}/krusader.desktop
 mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/krusader_root-mode.desktop \
 	$RPM_BUILD_ROOT%{_desktopdir}/krusader_root-mode.desktop
-
 %find_lang %{name} --with-kde
 
 # locolor icons are deprecated (see kde .spec-s)
 rm -f $RPM_BUILD_ROOT%{_iconsdir}/locolor/*/apps/*.png
 
+# confilicts with krusader
+rm $RPM_BUILD_ROOT%{_libdir}/kde3/kio_tar.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT