From 09e5ca9974473ad5069b087f3639b1e9c7946bdb72cf6acf782857e3bb53a394 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 13 Sep 2008 12:34:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krusader?expand=0&rev=9 --- build-kde-3.4.diff | 19 -------- krusader-1.90.0.tar.bz2 | 3 -- krusader-2.0.0-beta1.tar.bz2 | 3 ++ krusader.changes | 17 +++++++ krusader.spec | 89 ++++++++++++++++++++++-------------- krusader_root_mode.patch | 19 ++++++++ 6 files changed, 93 insertions(+), 57 deletions(-) delete mode 100644 build-kde-3.4.diff delete mode 100644 krusader-1.90.0.tar.bz2 create mode 100644 krusader-2.0.0-beta1.tar.bz2 create mode 100644 krusader_root_mode.patch diff --git a/build-kde-3.4.diff b/build-kde-3.4.diff deleted file mode 100644 index 3359c9d..0000000 --- a/build-kde-3.4.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ./krusader/VFS/krpermhandler.cpp 2007/08/19 14:45:52 1.1 -+++ ./krusader/VFS/krpermhandler.cpp 2007/08/19 14:48:19 -@@ -279,8 +279,6 @@ - } - - QString KRpermHandler::parseSize( KIO::filesize_t val ) { -- return KGlobal::locale()->formatNumber(QString::number(val), false, 0); --#if 0 - QString temp; - temp.sprintf( "%llu", val ); - if ( temp.length() <= 3 ) return temp; -@@ -294,7 +292,6 @@ - size = size + temp.right( 3 ); - - return size; --#endif - } - - QString KRpermHandler::date2qstring( QString date ) { diff --git a/krusader-1.90.0.tar.bz2 b/krusader-1.90.0.tar.bz2 deleted file mode 100644 index 8921609..0000000 --- a/krusader-1.90.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3cbe009092acbe62bd5d87e114143d9410943f4dbca7ac900cc4f7a9684de21 -size 3386085 diff --git a/krusader-2.0.0-beta1.tar.bz2 b/krusader-2.0.0-beta1.tar.bz2 new file mode 100644 index 0000000..476fb9c --- /dev/null +++ b/krusader-2.0.0-beta1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19fdc69bffe80e7ff735109d3bf446446f9b14069f61669d9a8482f7c06729bb +size 3255763 diff --git a/krusader.changes b/krusader.changes index 9ef4f14..4298915 100644 --- a/krusader.changes +++ b/krusader.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Jul 21 16:10:09 CEST 2008 - anschneider@suse.de + +- Fix starting krusader in root-mode from tools menu. + +------------------------------------------------------------------- +Wed Jul 16 17:55:21 CEST 2008 - anschneider@suse.de + +- updated to version 2.0.0 beta1: + * Ported to KDE4 not using any of the Qt3 support libs + * Experimental support for the Windows platform + * Send emails with Thunderbird + * Attach multiple files to emails + * Submenus for categories in UserAction menu and context menu + * Select encoding in content search and krarc + * New synchronizer shortcuts + ------------------------------------------------------------------- Sat Mar 22 08:47:03 CET 2008 - stbinner@suse.de - update to version 1.90.0: diff --git a/krusader.spec b/krusader.spec index 0890b8e..c258a4f 100644 --- a/krusader.spec +++ b/krusader.spec @@ -1,10 +1,17 @@ # -# spec file for package krusader (Version 1.90.0) +# spec file for package krusader (Version 1.99.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,17 +19,17 @@ Name: krusader -BuildRequires: kdebase3-devel +BuildRequires: libkde4-devel update-desktop-files Requires: kio_iso Url: http://krusader.sourceforge.net/ License: GPL v2 or later Group: Productivity/File utilities Summary: A File Manager -Version: 1.90.0 +Version: 1.99.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: krusader-%{version}.tar.bz2 -Patch5: build-kde-3.4.diff +Source0: krusader-2.0.0-beta1.tar.bz2 +Patch00: krusader_root_mode.patch %description An advanced twin panel (commander style) file manager for KDE. @@ -35,6 +42,7 @@ Authors: Rafi Yanai %package -n kio_iso +License: GPL v2 or later Group: System/GUI/KDE Summary: KIO slave to access ISO images @@ -49,47 +57,58 @@ Authors: Szombathelyi Gygy %prep -%setup -%if %suse_version < 1010 -%patch5 +%setup -n krusader-2.0.0-beta1 +%patch00 -p1 +%if !0%{?opensuse_bs} %endif -. /etc/opt/kde3/common_options -update_admin %build -. /etc/opt/kde3/common_options -./configure $configkde --disable-final -do_make %{?jobs:-j %jobs} +%cmake_kde4 -d build +%make_jobs %install -. /etc/opt/kde3/common_options +pushd build %makeinstall -%find_lang %name -%suse_update_desktop_file krusader System FileManager -%suse_update_desktop_file krusader_root-mode System FileManager -kde_post_install +%kde_post_install +popd +%find_lang %{name} -%files -f %name.lang +%clean +%__rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang %defattr(-,root,root) %doc README AUTHORS COPYING ChangeLog INSTALL TODO -/opt/kde3/bin/* -/opt/kde3/share/appl*/*/* -/opt/kde3/share/apps/krusader -/opt/kde3/share/icons/??color/??x?? -/opt/kde3/%_lib/kde3/kio_krarc.* -/opt/kde3/share/services/krarc.protocol -/opt/kde3/%_lib/kde3/kio_virt.* -/opt/kde3/share/services/virt.protocol -%_mandir/man1/* +%_bindir/krusader +%doc %lang(en) /usr/share/doc/kde/HTML/en/krusader +%_kde_share_dir/apps/krusader +%_kde_share_dir/services/krarc.protocol +%_kde4_modules/kio_krarc.so +/usr/share/applications/kde4/krusader*.desktop +/usr/share/icons/??color/*/apps/krusader*.png %files -n kio_iso %defattr(-,root,root) -%config /opt/kde3/share/config/kio_isorc -/opt/kde3/%_lib/kde3/kio_iso.* -/opt/kde3/share/services/iso.protocol -/opt/kde3/share/apps/konqueror +%config /usr/share/kde4/config/kio_isorc +%_kde4_modules/kio_iso.so* +%_kde_share_dir/services/iso.protocol %changelog +* Mon Jul 21 2008 anschneider@suse.de +- Fix starting krusader in root-mode from tools menu. +* Wed Jul 16 2008 anschneider@suse.de +- updated to version 2.0.0 beta1: + * Ported to KDE4 not using any of the Qt3 support libs + * Experimental support for the Windows platform + * Send emails with Thunderbird + * Attach multiple files to emails + * Submenus for categories in UserAction menu and context menu + * Select encoding in content search and krarc + * New synchronizer shortcuts * Sat Mar 22 2008 stbinner@suse.de - update to version 1.90.0: * addition of many (JavaScript) user actions, midnight commander @@ -205,7 +224,7 @@ kde_post_install - update to 0.79-1 * Thu Mar 01 2001 ro@suse.de - added fam to neededforbuild -* Mon Jan 01 2001 adrian@suse.de +* Tue Jan 02 2001 adrian@suse.de - update to 0.75-1 * Fri Dec 01 2000 kukuk@suse.de - Remove duplicate entries diff --git a/krusader_root_mode.patch b/krusader_root_mode.patch new file mode 100644 index 0000000..c1591e7 --- /dev/null +++ b/krusader_root_mode.patch @@ -0,0 +1,19 @@ +Index: krusader-2.0.0-beta1/krusader/krslots.cpp +=================================================================== +--- krusader-2.0.0-beta1.orig/krusader/krslots.cpp ++++ krusader-2.0.0-beta1/krusader/krslots.cpp +@@ -544,11 +544,11 @@ void KRslots::rootKrusader() + KMessageBox::sorry( krApp, i18n( "Can't start root mode krusader, because krusader or kdesu is missing from the path. Please configure the dependencies in Konfigurator!" ) ); + return; + } +- ++ + KProcess proc; + proc << KrServices::fullPathName( "kdesu" ) << KrServices::fullPathName( "krusader" ) +- << "--left=" + MAIN_VIEW->left->func->files()->vfs_getOrigin().url() +- << "--right=" + MAIN_VIEW->right->func->files()->vfs_getOrigin().url(); ++ + " --left=" + MAIN_VIEW->left->func->files()->vfs_getOrigin().url() ++ + " --right=" + MAIN_VIEW->right->func->files()->vfs_getOrigin().url(); + + if (!proc.startDetached()) + KMessageBox::error(0,i18n("Error executing %1!", proc.program()[0]));