SHA256
1
0
forked from pool/krusader

Accepting request 141048 from KDE:Distro:Factory

- Add bug309159.patch from upstream, to fix crashes with previewing video files
- Properly annotate previous patch (krusader-2.4.0-beta2-generate-manpage.patch) (forwarded request 141027 from sumski)

OBS-URL: https://build.opensuse.org/request/show/141048
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krusader?expand=0&rev=39
This commit is contained in:
Stephan Kulow 2012-11-13 16:07:05 +00:00 committed by Git OBS Bridge
parent 432f154930
commit f9269501fe
9 changed files with 397 additions and 87 deletions

View File

@ -1,12 +0,0 @@
Index: krusader/Panel/krvfsmodel.cpp
===================================================================
--- krusader/Panel/krvfsmodel.cpp (revision 6248)
+++ krusader/Panel/krvfsmodel.cpp (working copy)
@@ -610,6 +610,7 @@
return compareTexts( sp->data(), sp2->data(), sp->properties(), sp->isAscending(), true );
}
file1->vfile_getName() < file2->vfile_getName();
+ return false;
}
bool itemGreaterThan( SortProps *sp, SortProps *sp2 )

66
bug309159.patch Normal file
View File

@ -0,0 +1,66 @@
From: Jan Lepper <jan_lepper@gmx.de>
Date: Tue, 30 Oct 2012 21:15:43 +0000
Subject: FIXED: [ 309159 ] Crash in video files preview on F3
X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=770fa41c1f8e76d91eb981ee56d972efe10dc667
---
FIXED: [ 309159 ] Crash in video files preview on F3
remove unnecessary code that possibly
- causes infinite recursion
- uses an invalid KUrl object
BUG: 309159
---
--- a/krusader/KViewer/krviewer.cpp
+++ b/krusader/KViewer/krviewer.cpp
@@ -534,11 +534,6 @@
if (!pvb->part())
return;
- //FIXME this belongs to PanelViewer
- if (!pvb->part()->url().equals(pvb->url(), KUrl::CompareWithoutTrailingSlash)) {
- pvb->setUrl(pvb->part()->url());
- }
-
int ndx = tabBar.indexOf(pvb);
tabBar.setTabText(ndx, makeTabText(pvb));
tabBar.setTabIcon(ndx, makeTabIcon(pvb));
--- a/krusader/KViewer/panelviewer.cpp
+++ b/krusader/KViewer/panelviewer.cpp
@@ -214,9 +214,9 @@
KParts::ReadOnlyPart* PanelViewer::openUrl(const KUrl &url, KrViewer::Mode mode)
{
- emit urlChanged(this, url);
closeUrl();
curl = url;
+ emit urlChanged(this, url);
KMimeType::Ptr mt = KMimeType::findByUrl(url);
QString mimetype = mt->name();
@@ -328,9 +328,9 @@
KParts::ReadOnlyPart* PanelEditor::openUrl(const KUrl &url, KrViewer::Mode mode)
{
- emit urlChanged(this, url);
closeUrl();
curl = url;
+ emit urlChanged(this, url);
KFileItem item = readFileInfo(url);
KIO::filesize_t fileSize = item.isNull() ? 0 : item.size();
--- a/krusader/KViewer/panelviewer.h
+++ b/krusader/KViewer/panelviewer.h
@@ -41,9 +41,6 @@
virtual ~PanelViewerBase();
inline KUrl url() const {
return curl;
- }
- inline void setUrl(KUrl url) {
- emit urlChanged(this, url); curl = url;
}
inline KParts::ReadOnlyPart* part() const {
return cpart;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ef6a314cd9b8592b0d131825d79185ec291ae8e619f6a8ad687c01b0ff582c8
size 3591948

View File

@ -0,0 +1,8 @@
diff -up krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt.generate-manpage krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt
--- krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt.generate-manpage 2012-10-15 08:51:50.570757518 +0200
+++ krusader-2.4.0-beta2/doc/en_US/CMakeLists.txt 2012-10-15 08:52:56.522420929 +0200
@@ -1 +1,3 @@
kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR krusader )
+kde4_create_manpage(man-krusader.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
+

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae
size 4305463

View File

@ -1,38 +0,0 @@
Index: krusader/VFS/kiojobwrapper.cpp
===================================================================
--- krusader/VFS/kiojobwrapper.cpp.orig 2009-04-11 21:40:15.000000000 +0200
+++ krusader/VFS/kiojobwrapper.cpp 2010-09-09 11:11:42.176303083 +0200
@@ -28,6 +28,7 @@
* *
***************************************************************************/
+#include <stdio.h>
#include "kiojobwrapper.h"
#include <qevent.h>
#include <kurl.h>
Index: krusader/MountMan/kmountmangui.h
===================================================================
--- krusader/MountMan/kmountmangui.h.orig 2009-04-11 21:40:19.000000000 +0200
+++ krusader/MountMan/kmountmangui.h 2010-09-09 11:12:48.538260441 +0200
@@ -112,7 +112,7 @@ private:
/////////////////////////////////////////////////////////////////
class fsData {
public:
- fsData() : Name( 0 ), Type( 0 ), MntPoint( 0 ), TotalBlks( 0 ),
+ fsData() : TotalBlks( 0 ),
FreeBlks( 0 ), Mounted( false ) {}
// get information
Index: krusader/Search/krsearchdialog.h
===================================================================
--- krusader/Search/krsearchdialog.h.orig 2009-04-11 21:40:24.000000000 +0200
+++ krusader/Search/krsearchdialog.h 2010-09-09 11:17:15.776260233 +0200
@@ -62,7 +62,7 @@ class QTreeWidgetItem;
class KrSearchDialog : public QDialog {
Q_OBJECT
public:
- KrSearchDialog(QString profile = 0, QWidget* parent = 0 );
+ KrSearchDialog(QString profile = QString::null, QWidget* parent = 0 );
void prepareGUI();

View File

@ -1,11 +0,0 @@
--- 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})

View File

@ -1,3 +1,302 @@
-------------------------------------------------------------------
Mon Nov 12 21:18:46 UTC 2012 - hrvoje.senjan@gmail.com
- Add bug309159.patch from upstream, to fix crashes with previewing video files
- Properly annotate previous patch (krusader-2.4.0-beta2-generate-manpage.patch)
-------------------------------------------------------------------
Sat Nov 10 20:40:31 UTC 2012 - hrvoje.senjan@gmail.com
- Update to 2.4.0-beta3
Changes since 2.0.0:
* FIXED: crash when trying to open/(un)mount ejectable device via media menu
* ADDED: options: Panel > Media Menu >
Show Mount Path
Show File Sytem Type
Show Size (Always | When Device has no Label | Never)
* ADDED: pressing CTRL+RETURN when media menu is open (un)mounts the highlighted device
* ADDED: action: Bring Main Window to Top (global shortcut possible)
* ADDED: option: General > Viewer/Editor > Viewer > Use Okteta As Hex Viewer
(default: on)
* ADDED: option: Archives > krarc > Enable Write Support
* ADDED: splitter option: Overwrite files without confirmation
* ADDED: action: Go to Other Panel's Directory - shortcut: CTRL+=
* CHANGED: krarc write support is disabled by default
* CHANGED: user action manager starts with the "Basic Properties" tab active
* CHANGED: detailed view: "Automatically Resize Columns" setting is remembered
* FIXED: [ 306472 ] Krusader fails to build when using clang as compiler -
thanks to Jekyll Wu
* FIXED: [ 308193 ] Krusader closes the search window after file editing -
thanks to Alexander
* FIXED: pressing the context menu key when the media menu is shown
opens the context menu for a random item instead of the current
* FIXED: [ 300514 ] no warning if terminal emulator can't be created
* FIXED: [ 303209 ] passwords for remote connections are stored in config
NOTE: passwords already stored in krusaderrc may still be left
* FIXED: [ 280946 ] viewer: incorrect tab's file names when moving tabs
* FIXED: user actions: "run in the embedded terminal emulator" setting is not saved
* FIXED: mountman: mount list is not refreshed if /etc/mtab is a symlink to /proc/mounts
* FIXED: [ 148866 ] create new directory: spaces are stripped out
* FIXED: [ 305069 ] list panel is not autoscrolled to the cursor (in brief view)
* FIXED: [ 173690 ] file ACLs are not displayed correctly in properties dialog
- thanks to Eugeny Shkrigunov
* FIXED: It is impossible to select a non-default folder in the search dialog
* FIXED: splitter overwrites files without confirmation
* FIXED: [ 274483 ] crash when selecting items from popup-menu
* FIXED: [ 285778 ] View or edit files doesn't work
* FIXED: viewer tries to load obsolete libkhexedit2 part as hex viewer -
use okteta part instead
* FIXED: crash when trying to view files with embedded KOrganizer part
(avoids KOrganizer bug 205713)
* FIXED: "apply settings to other tab" action doesn't apply icon size
* FIXED: [ 198996 ] crash when closing viewer
* FIXED: [ 294501 ] toolbar "equal" has no shortcut
* FIXED: [ 108892 ] "Combine Files" overwrites existing target file without confirmation
* FIXED: Queue manager closed when any of the queues finished
* FIXED: [ 300922 ] crash when pause sftp transfer via queue on quit
* FIXED: [ 271265 ] krusader should search for kdesu executable in /usr/lib{64,}/kde4/libexec/
- thanks to Anssi Hannula / Ahmad Samir
* FIXED: [ 290304 ] Panel option "always sort dirs by name" doesn't work
* FIXED: [ 297926 ] state of the menu item 'Show hidden files' and the current setting is different
* FIXED: [ 234296 ] crash when closing disk usage view
* FIXED: [ 296718 ] execution of files that have spaces in their path doesn't work anymore
* FIXED: [ 294618 ] using "open with" on video files
causes their thumbnails to be created, even when not needed
* FIXED: root mode action doesn't work if a panel url contains spaces
* FIXED: relative url completion in address-bar only works in home dir
* FIXED: [ 242566 ] Cannot F3-View .vcf vCard files
* FIXED: Root action (which opens the root dir of the local filesystem)
is disabled in the root dir of nonlocal filesystems
* FIXED: when cutting to clipboard from virt:/ the virtual entries are immediately removed
* FIXED: Unselecting files before copy/move operation doesn't work for copy&paste
* FIXED: [ 277259 ] Unselecting files before copy/move operation doesn't work in the same panel
this also fixes the selection of the other panel being cleared instead
* FIXED: [ 276310 ] crash when trying to delete already deleted file
* FIXED: [ 277578 ] Crash on cancelling calculation of occupied space on smb share
* FIXED: krusader hangs for some time when opening a bz2(and possibly gzip)-compressed archive
* FIXED: loading defaults on the Panel page in Konfigurator has no effect
* FIXED: changes to "Show new/close tab buttons" don't take effect immediately
* FIXED: when options requiring a gui restart are changed, the panel history is lost
* FIXED: [ 277838 ] Swap Panels no longer works
* ADDED: option: Panel > Status/Totalsbar > Show space information
* ADDED: Konfigurator: reset button
* ADDED: option: Startup > User Interface > Show actions toolbar
* ADDED: options: Panel > Layout: "Compact", "Classic"
* ADDED: mountman gui option: Show only removable devices
* ADDED: tabs have close buttons
* ADDED: reset button for filter dialog
* ADDED: option: Panel > Operation > Filter dialog remembers settings
* ADDED: tabs can be dragged to the other side
* ADDED: action: Move Current Tab to Other Side - shortcut: CTRL + SHIFT + O
* ADDED: view: iconsizes 64, 128, 256
* ADDED: history is saved/restored
* ADDED: action: Restore Selection
* ADDED: option: Panel > Operation > Unselect files before copy/move
* ADDED: support for xz archives
* CHANGED: new default panel layout
* CHANGED: option: Panel > View > Show previews -> Show previews by default
* CHANGED: removed option "Show free disk space in the Totalsbar"
since that setting is controlled by the layout chosen in Panel >
Layout
* CHANGED: removed option "Preserve Attributes" - KIO always preserves
Attributes
* CHANGED: option: Panel > Filelist icon size -> Default icon size
* CHANGED: quickfilter follows case sensivity setting of quicksearch
* CHANGED: quickfilter expands wildcards
* CHANGED: duplicate tab / open in new tab:
create the new tab next to the current one.
* CHANGED: filter settings are saved/restored individually for each tab.
* CHANGED: filter settings are remembered when changing view type
* CHANGED: All view settings are saved/restored individually for each tab.
* FIXED: [ 3222819 (sf.net) ] Alt-Enter is not showing selected files'
properties
* FIXED: [ 274083 ] Search results list shows wrong extension when dir path
has a dot in it
* FIXED: [ 262761 ] krusader crashed on viewing text file with internal viewer
this was probably already fixed in 2.3.0-beta1
* FIXED: [ 229489 ] Seg fault moving ISO image files from USB Flash drive to
USB SATA HD
- thanks to Anssi Hannula
* FIXED: mountman gui might add the same mountpoint to the list multiple times
* FIXED: [ 3044425 (sf.net) ] Desktop freeze when opening a context menu
* FIXED: [ 217203 ] Krusader crashed when accessing sftp after resume from
sleep
* FIXED: [ 243716, 270605, 270588 ] crash when moving files
* FIXED: [ 256794 ] crash when file is deleted while a preview is being loaded
for it (and it is the only file for which a preview is being loaded)
* FIXED: [ 274732 ] Weird functionality after "directory doesn't exist"
* FIXED: [ 3216624 (sf.net) ] Krusader saves newly created files with
incorrect permissions
* FIXED: [ 2773302 (sf.net) ] krarc can't handle brackets in file paths inside
ZIP archive
* FIXED: [ 272876, 274269 ] crash when refreshing view
* FIXED: [ 3191155 (sf.net) ] Moving a symbolic link changes attributes of
target file
* FIXED: [ 2998795 (sf.net) ] "Show actions toolbar" setting is not saved
* FIXED: Url commandline argument opens a new tab instead of switching to an
existing one
* FIXED: root mode action does not work with newer versions of kdesu,
thanks to CyberCastle
* FIXED: switching tabs sometimes doesn't switch the panel
* FIXED: [ 3004510 (sf.net) ] Double-clicking executables start in
~/Documents folder
* FIXED: [ 2996188 (sf.net) ] relative path for custom folder icon doesn't
work
* FIXED: [ 2915020 (sf.net) ] wrong icon for directory symlink
* FIXED: when switching tabs, sometimes the new tab isn't set active
* FIXED: [ 263253 ] View displays wrong total size in some circumstances.
* FIXED in 2.3.0-beta1, but not recorded in Changelog at release time:
[ 259495 ] crash when closing search dialog
* ADDED: option: Panel > General > Flat Origin Bar
* ADDED: option: Panel > Buttons > Toolbar buttons have icons
* ADDED: listpanel buttons: Back, Forward
* ADDED: options: Panel > Layout >
Layout / Frame Color / Frame Shape / Frame Shadow
* ADDED: QuickFilter - default shortcut: CTRL+i
* ADDED: option: Panel > View > Show directories first
* ADDED: actions: Back/Forward in history
* ADDED: action: Set Focus to the Panel - shortcut: ESC
* ADDED: actions: Move Focus Up/Down - shortcut: CTRL+SHIFT+Up/Down
* ADDED: selection dialog option: Apply selection to directories
* ADDED: option: Startup > User Interface > Update default panel settings
* ADDED: dbus interface: org.krusader.Instance.openUrl(QString url)
* ADDED: search dialog > feed to listbox:
search parameters are saved as metadata in the virtual fs and
displayed in panel's statusbar
* ADDED: filter option: Apply filter to directories
* ADDED: action: view > Apply settings to other tabs
* ADDED: action: view > Save settings as default (for new instances of this
view type)
* ADDED: option: Panel > View > Locale aware sorting
* CHANGED: Media Button shows Solid Icon for currently opened device
* CHANGED: Removed options Panel > General > Status/Totalsbar >
Statusbar Frame / Statusbar Background / Show Statusbar /
Show Totalsbar. They are customizable in layout.xml.
* CHANGED: Use KrView for displaying search results,
which is much faster than the previously used QTreeWidget.
* CHANGED: Removed default shortcuts for the Left/Right Bookmarks actions,
as they conflict with the Back/Forward actions.
* CHANGED: After failed refresh, only focus location bar if the url was entered
manually.
* CHANGED: Removed default shortcut for 'Cancel Refresh of View' as it conflicts
with the 'Set Focus to the Panel' action. Unless a shortcut is
assigned manually, ESC cancels the refresh when the panel is focused.
* CHANGED: Konfigurator: "apply" takes effect immediately.
* CHANGED: Url commandline argument: if there is already a tab open with that
url, it is activated, otherwise a new tab is opened in the active
panel.
* FIXED: When trying to close Konfigurator but canceling the
"Apply changes ?" dialog, Konfigurator it is closed anyway.
* FIXED: [ 3073211 ] Wrong quoting when opening file in external editor
* FIXED: [ 3059457 ] new panel uses default columns instead of configured
ones
* FIXED: [ 2898151 ] also in view-mode (F3) possible to edit, thanks to Kevin
Kofler
* FIXED: panelpopup viewer: error messageboxes when file cannot be displayed
* FIXED: [ 2981303 ] Viewer/editor unused submenu Game, thanks to Kevin
Kofler
* FIXED: regression making single-click mode unusable, thanks to Kevin Kofler
* FIXED: [ 3003338 ] Rename selects extension regression, thanks to Kevin
Kofler
* FIXED: [ 2980201 ] KrViewer doesn't handle binary files well (this fix
works only for local files !)
* FIXED: "sort by" useractions change sorting direction randomly
* FIXED: [ 3028599 ] Sorting criteria is not saved at exit
* FIXED: [ 2949337 ] splitter ui bug
* FIXED: [ 2843749 ] view item is deselected when updated
* FIXED: [ 268037 (bugs.kde.org) ] brief view: mouse wheel doesn't work
* FIXED: brief view: mouse selection doesn't work in columns > columns per
page
* FIXED: selecting a bigger number of files is very slow
* FIXED: [ 2969403 ] KrViewer shows old file content if file is overwritten,
thanks to Kevin Kofler
* FIXED: [ 246424 (bugs.kde.org) ] krusader tries to load WHOLE big file into
memory on F3
* FIXED: [ 2154760 ] Krusader erases files when opening for editing
* FIXED: changing sort direction is slow
* FIXED: [ 3015094 ] krusader doesn't exit at closing the application
* FIXED: right clicking on media button doesn't work
* FIXED: tabs were no longer movable, thanks to Victor (kernel_daemon)
* FIXED: 3 valgrind fixes by Alexander Stein
* FIXED: viewer would show empty menus, thanks to CtHx
* FIXED: crash when changing view type
* ADDED: option: Panel > General > Tabs > Show new/close tab buttons
* ADDED: options: Panel > Buttons > Show Media/History/Bookmarks Button
* ADDED: options: Panel > General > Status/Totalsbar settings >
Show Statusbar, Show Totalsbar, Show Size In Bytes,
Show free disk space in the Totalsbar
* ADDED: option: Look&Feel > Quicksearch > "Up/Down cancels Quicksearch"
* ADDED: dbus interface: org.krusader.PanelManager.newTab(QString url) /
newTabs(QStringList)
* ADDED: url command-line argument
* ADDED: action "Show View Options Menu"
* ADDED: detailed view context-menu option "Automatically Resize Columns"
* ADDED: action "cancel refresh" triggered by ESC by default
* ADDED: change icon size individually per view
* ADDED: thumbnails - toggleable by mainmenu > view > Show Previews
* ADDED: 128x128 pixel versions of the application icon, needed by Mac OS X
* ADDED: Konfigurator options: Look&Feel > Panel >
Status/Totalsbar settings > Draw frame / Fill background
* ADDED: Konfigurator option: Colors > Colors > Other > Statusbar
* ADDED: Konfigurator option: Look&Feel > Panel > Panel layout >
Quicksearch position / Tab Bar position
* ADDED: buttons "(un)mount" and "eject" in mountman gui
* ADDED: KMountMan::removable(), KMountMan::networkFilesystem()
* CHANGED: reorganize Konfigurator: "Look & Feel" page becomes "Panel" /
move several options to new places
* CHANGED: when open/refresh of a dir fails, don't annoy the user with a message
box, but display the error embedded into the panel
* CHANGED: icon size, icons/previews on/off are set separately per view type
* CHANGED: dim icons in unfocused panel (if dim colors is activated)
* CHANGED: mountman gui: retrieve icons from Solid
* CHANGED: mountman gui: change mount check interval from 3000 to 500 ms
* CHANGED: mountman gui: current selection persists refresh of mountlist,
mountlist is focused after refresh
* CHANGED: dont't execute a process if the correct working dir cannot be set
* CHANGED: dont't retrieve working dir of the cmdline from the label which might
get truncated - store it in a string instead
* FIXED: brief view: clicking on the space below a column selects the first
item of the next column
* FIXED: if refresh has failed, the origin bar is focused even if the panel is
not active
* FIXED: if the path of an inactive panel changes, the embedded cmdline is set
to that path
* FIXED: useraction commands, or those entered in the embedded cmdline, are
sometimes not executed in the correct working dir
* FIXED: when multiple commands are entered in the embedded cmdline or a
useraction, and execution mode is set to terminal, only the first
command is executed in a new terminal and the others in the same
terminal (if any) as krusader
* FIXED: commands entered via command line are mixed up with history
* FIXED: [ 2790819, 2892768, 2915192 ] Can't resize columns properly
* FIXED: disk usage dialog layout problem
* FIXED: [ 2907607 ] crash while closing
* FIXED: if a panel is focused by clicking on the header, the colors/actions
are not updated
* FIXED: mountman: unmounting is not possible if currently opened dir is below
the mountpoint
* FIXED: [ 2860400 ] Drag'n'drop to kmail broken
* FIXED: [ 2904850 ] panels are not repainted
* FIXED: deadlock when trying to display error message after failed mount
* FIXED: [ 2858133 ] wrong background color in listviews
* ADDED: file regex in quick search, thanks to GregC
* ADDED: lister: a fast text/hex viewer for Krusader
* ADDED: service menu, thanks to Tomasz Kalkosinski
* ADDED: queued packing / unpacking
* ADDED: lock tabs, close inactive tabs, close duplicated tabs
* ADDED: better trash integration
* CHANGED: the packer/unpacker/archive tester are job based now
* CHANGED: the old views were replaced by the interviews
* FIXED: [ 2857663 ] deadlock when trying to display error message after
failed unmount
* FIXED: problem with autorefresh in the new interviews
* FIXED: [ 2609505 ] problem with directory refresh
* FIXED: [ 2793916 ] KHistoryComboBox content can change the window width
* FIXED: [ 2805624 ] ctrl-left/right arrow with locked tabs on the other panel
* FIXED: panels sometimes lose focus
* FIXED: directory compare modes don't work
* FIXED: [ 2609483 ] unpacking to directories with international characters
-------------------------------------------------------------------
Mon Nov 21 19:32:26 UTC 2011 - ctrippe@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package krusader
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,20 +19,22 @@
%define jobs $(( `/usr/bin/getconf _NPROCESSORS_ONLN` + 1 ))
Name: krusader
Version: 2.0.0
Release: 20
License: GPL-2.0+
Version: 2.4.0~beta3
Release: 0
%define tar_version 2.4.0-beta3
Summary: A File Manager
Url: http://krusader.sourceforge.net/
License: GPL-2.0+
Group: Productivity/File utilities
Source: %{name}-%{version}.tar.bz2
Url: http://krusader.sourceforge.net/
Source: %{name}-%{tar_version}.tar.bz2
Source1: krusader_browse_iso.desktop
Patch0: FIXME.diff
Patch1: krusader-gcc44.diff
Patch2: krusader-link-solid.patch
BuildRequires: dos2unix
# PATCH-FIX-OPENSUSE krusader-2.4.0-beta2-generate-manpage.patch -- generate manpage
Patch0: krusader-2.4.0-beta2-generate-manpage.patch
# PATCH-FIX-UPSTREAM bug309159.patch [kde#309159]
Patch1: bug309159.patch
BuildRequires: fdupes
BuildRequires: libkde4-devel
BuildRequires: libkonq-devel
Requires: kate
Requires: kio_iso = %{version}
Recommends: %{name}-doc
@ -43,7 +45,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
An advanced twin panel (commander style) file manager for KDE.
%package -n kio_iso
License: GPL-2.0+
Summary: KIO slave to access ISO images
Group: System/GUI/KDE
Provides: kde4-kio_iso = 1.80.99
@ -55,7 +56,6 @@ KIO slave to access ISO images like zip- or tar.gz-archives in your
file-browser.
%package doc
License: GPL-2.0+
Summary: A File Manager
Group: Productivity/File utilities
@ -63,16 +63,9 @@ Group: Productivity/File utilities
An advanced twin panel (commander style) file manager for KDE.
%prep
%setup -q
%patch0
%patch1
%patch2
mv po/sr\@Latn.po po/sr\@latin.po
for file in doc/en/*.docbook;
do
dos2unix $file
done
%setup -q -n %{name}-%{tar_version}
%patch0 -p1
%patch1 -p1
%build
export RPM_OPT_FLAGS="%{optflags} -fpermissive"
@ -103,7 +96,8 @@ cp %{SOURCE1} %{buildroot}%{_kde4_servicesdir}/ServiceMenus/
%{_kde4_iconsdir}/??color/*/apps/krusader*.png
%{_kde4_modules}/kio_krarc.so
%{_kde4_servicesdir}/krarc.protocol
%exclude %{_kde4_htmldir}/en/krusader
%{_kde4_mandir}/man1/krusader.1.gz
%exclude %{_kde4_htmldir}/*/krusader
%files -n kio_iso
%defattr(-,root,root)
@ -115,5 +109,9 @@ cp %{SOURCE1} %{buildroot}%{_kde4_servicesdir}/ServiceMenus/
%files doc
%defattr(-,root,root)
%doc %lang(en) %{_kde4_htmldir}/en/krusader
%doc %lang(uk) %{_kde4_htmldir}/uk/krusader
%doc %lang(sv) %{_kde4_htmldir}/sv/krusader
%doc %lang(pt) %{_kde4_htmldir}/pt/krusader
%doc %lang(pt_BR) %{_kde4_htmldir}/pt_BR/krusader
%changelog