From 41c1ccaafb6aebef43489c3ee46d979c21c429a6 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Sat, 9 Sep 2006 10:49:32 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create branch 'KDE3_BRANCH'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from master 2006-09-09 10:49:22 UTC Arkadiusz Miśkiewicz '- fix problems with autoconf 2.60 which creates configure that runs in POSIX mode' Delete: krusader-desktop.patch krusader-krviewer.patch krusader-mount.patch krusader.spec --- krusader-desktop.patch | 18 ------- krusader-krviewer.patch | 54 --------------------- krusader-mount.patch | 11 ----- krusader.spec | 102 ---------------------------------------- 4 files changed, 185 deletions(-) delete mode 100644 krusader-desktop.patch delete mode 100644 krusader-krviewer.patch delete mode 100644 krusader-mount.patch delete mode 100644 krusader.spec diff --git a/krusader-desktop.patch b/krusader-desktop.patch deleted file mode 100644 index a0ebc44..0000000 --- a/krusader-desktop.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- krusader-1.60.0-beta1/krusader/krusader_root-mode.desktop 2005-01-13 00:10:48.000000000 +0100 -+++ krusader-1.60.0-beta1/krusader/krusader_root-mode.desktop 2005-03-04 00:57:38.061467864 +0100 -@@ -3,6 +3,7 @@ - Name=Krusader - root-mode - Name[de]=Krusader - root-Modus - Name[cs]=Krusader s právy roota -+Name[pl]=Krusader - tryb administratora - Exec=krusader -caption "%c" %i %m - Icon=krusader_red.png - Terminal=false -@@ -15,6 +16,7 @@ - Comment=Twin-Panel File Manager with root-privileges - Comment[de]=Zwei-Fenster Dateimanager mit root-Privilegien - Comment[cs]=Dvojpanelový správce souborů s právy Roota -+Comment[pl]=Dwupanelowy zarządca plików - tryb administratora - GenericName=File Manager - GenericName[af]=Lêer Bestuurder - GenericName[ar]=مدير الملفات diff --git a/krusader-krviewer.patch b/krusader-krviewer.patch deleted file mode 100644 index 4da38f7..0000000 --- a/krusader-krviewer.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -U 3 -H -d -r -N -- krusader-1.70.0-beta1.orig/krusader/Locate/locate.cpp krusader-1.70.0-beta1/krusader/Locate/locate.cpp ---- krusader-1.70.0-beta1.orig/krusader/Locate/locate.cpp 2005-05-26 01:00:42.000000000 +0200 -+++ krusader-1.70.0-beta1/krusader/Locate/locate.cpp 2005-10-03 07:15:20.000000000 +0200 -@@ -386,14 +386,18 @@ - void LocateDlg::operate( QListViewItem *item, int task ) - { - KURL name = vfs::fromPathOrURL( item->text( 0 ) ); -- -+ KrViewer::Mode mode = KrViewer::Generic; -+ krConfig->setGroup( "General" ); -+ bool new_window = krConfig->readBoolEntry( "View In Separate Window", _ViewInSeparateWindow ); -+ - switch ( task ) - { - case VIEW_ID: -- KrViewer::view( name ); // view the file -+ KrViewer::view( name, mode, new_window ); // view the file - break; - case EDIT_ID: -- KrViewer::edit( name ); // view the file -+ mode = KrViewer::Text; -+ KrViewer::edit( name, mode, new_window ); // edit the file - break; - case FIND_ID: - { -diff -U 3 -H -d -r -N -- krusader-1.70.0-beta1.orig/krusader/Panel/panelfunc.cpp krusader-1.70.0-beta1/krusader/Panel/panelfunc.cpp ---- krusader-1.70.0-beta1.orig/krusader/Panel/panelfunc.cpp 2005-09-30 23:44:30.000000000 +0200 -+++ krusader-1.70.0-beta1/krusader/Panel/panelfunc.cpp 2005-10-03 07:39:20.000000000 +0200 -@@ -324,8 +324,11 @@ - KMessageBox::sorry( 0, i18n( "No permissions to view this file." ) ); - return ; - } -+ KrViewer::Mode mode = KrViewer::Generic; -+ krConfig->setGroup( "General" ); -+ bool new_window = krConfig->readBoolEntry( "View In Separate Window", _ViewInSeparateWindow ); - // call KViewer. -- KrViewer::view( files() ->vfs_getFile( fileName ) ); -+ KrViewer::view( files() ->vfs_getFile( fileName ), mode, new_window ); - // nothing more to it! - } - -@@ -364,8 +367,11 @@ - KMessageBox::sorry( 0, i18n( "No permissions to edit this file." ) ); - return ; - } -+ KrViewer::Mode mode = KrViewer::Text; -+ krConfig->setGroup( "General" ); -+ bool new_window = krConfig->readBoolEntry( "View In Separate Window", _ViewInSeparateWindow ); - -- KrViewer::edit( files() ->vfs_getFile( name ) ); -+ KrViewer::edit( files() ->vfs_getFile( name ), mode, new_window ); - } - - void ListPanelFunc::moveFiles() { diff --git a/krusader-mount.patch b/krusader-mount.patch deleted file mode 100644 index c9b2338..0000000 --- a/krusader-mount.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- krusader/MountMan/kmountman.cpp.orig 2004-10-20 00:46:42.000000000 +0200 -+++ krusader/MountMan/kmountman.cpp 2004-10-22 14:24:23.398732536 +0200 -@@ -62,7 +62,7 @@ - } - - // list of FS that we don't manage at all -- invalid_fs << "swap" << "/dev/pts" << "tmpfs" << "devpts" << "sysfs" << "rpc_pipefs" << "usbfs" << "binfmt_misc"; -+ invalid_fs << "swap" << "/dev/pts" << "tmpfs" << "devpts" << "sysfs" << "rpc_pipefs" << "usbfs" << "binfmt_misc" << "devfs" << "usbdevfs" << "selinuxfs"; - #if defined(BSD) - invalid_fs << "procfs"; - #else diff --git a/krusader.spec b/krusader.spec deleted file mode 100644 index 88ad7f4..0000000 --- a/krusader.spec +++ /dev/null @@ -1,102 +0,0 @@ -# -# Conditional build: -%bcond_without libkonq # importing the right click menu of konqueror -%bcond_without libkjsembed # with libkjsembed -# -#%%define _beta beta2 -Summary: Krusader is a filemanager for KDE 3 -Summary(pl): Krusader jest zarz±dc± plików dla KDE 3 -Name: krusader -Version: 1.70.1 -Release: 1 -License: GPL -Group: X11/Applications -Source0: http://dl.sourceforge.net/krusader/%{name}-%{version}.tar.gz -# Source0-md5: d8b33c94385fe055d55f592f0dc15c36 -Patch0: %{name}-desktop.patch -Patch1: %{name}-mount.patch -Patch2: %{name}-krviewer.patch -URL: http://krusader.sourceforge.net/ -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gettext-devel -%{?with_libkonq:BuildRequires: kdebase-devel} -%{?with_libkjsembed:BuildRequires: kdebindings-kjsembed-devel} -BuildRequires: kdelibs-devel >= 3.5.0-4 -BuildRequires: qt-devel >= 3.3 -BuildRequires: rpmbuild(macros) >= 1.129 -BuildRequires: sed >= 4.0 -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%undefine with_ccache - -%description -Krusader is a filemanager for KDE 3, patterned after old-school -managers like midnight commander and norton commander. It features -basically all your file-management needs, plus extensive archive -handling, mounted filesystems support, FTP and much much more. It is -(almost) completely customizable, very user friendly, fast and damn -good looking :-). You should give it a try. - -%description -l pl -Krusader jest zarz±dc± plików dla KDE 3, wzorowanym na takich -zarz±dcach "starej szko³y", jak Midnight Commander czy Norton -Commander. Zaspokaja w zasadzie wszystkie podstawowe potrzeby w -zarz±dzaniu plików, dodatkowo obs³uguje archiwa, montowanie systemów -plików, FTP i o wiele, wiele wiêcej. Jest (prawie) ca³kowicie -ustawialny, bardzo przyjazny dla u¿ytkownika, szybki i cholernie ³adny -:-). Powiniene¶ go wypróbowaæ. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p0 -%patch2 -p1 - -%build -cp -f /usr/share/automake/config.sub admin -export QTDIR=%{_prefix} -export KDEDIR=%{_prefix} -%configure \ - --with-kiotar \ - %{!?with_libkonq:--without-konqueror} \ - %{!?with_libkjsembed:--without-javascript} \ - --%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \ - --with-qt-libraries=%{_libdir} - -%{__make} - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_desktopdir} - -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - kde_htmldir=%{_kdedocdir} - -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 - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %{name}.lang -%defattr(644,root,root,755) -%doc AUTHORS ChangeLog FAQ README TODO doc/actions_tutorial.txt -%attr(755,root,root) %{_bindir}/krusader -%attr(755,root,root) %{_libdir}/kde3/*.so -%{_libdir}/kde3/*.la -%{_datadir}/apps/krusader -%{_datadir}/apps/konqueror/servicemenus/isoservice.desktop -%{_datadir}/config/kio_isorc -%{_datadir}/services/*.protocol -%{_desktopdir}/krusader*.desktop -%{_iconsdir}/crystalsvg/*/apps/*.png -%{_mandir}/man1/krusader.1* -- 2.44.0