From b577e9ca6c82e44b29e6aba6b8797db40c4aeeb7fe48a461a5cfe4dc484ea66d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Mar 2009 00:16:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krusader?expand=0&rev=16 --- FIXME.diff | 12 ++++++++++++ krusader.changes | 10 ++++++++++ krusader.spec | 21 +++++++++++++++------ qt45.diff | 11 ----------- trunk.diff.bz2 | 3 +++ 5 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 FIXME.diff delete mode 100644 qt45.diff create mode 100644 trunk.diff.bz2 diff --git a/FIXME.diff b/FIXME.diff new file mode 100644 index 0000000..784cc0d --- /dev/null +++ b/FIXME.diff @@ -0,0 +1,12 @@ +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 ) diff --git a/krusader.changes b/krusader.changes index 26c6c4f..3bc9b4d 100644 --- a/krusader.changes +++ b/krusader.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Mar 21 10:34:23 CET 2009 - beineri@opensuse.org + +- added SVN trunk diff: + * archive dialog now remembers compression level + * changed default Alt+letter shortcuts, see details in SVNNEWS + * initial Konfigurator size is now 900x680 + * view properties for detailed/brief/interviews are merged + * several bugfixes + ------------------------------------------------------------------- Fri Mar 6 15:55:41 CET 2009 - wstephenson@suse.de diff --git a/krusader.spec b/krusader.spec index ecbd056..30d5517 100644 --- a/krusader.spec +++ b/krusader.spec @@ -1,5 +1,5 @@ # -# spec file for package krusader (Version 1.99.1.svn6082) +# spec file for package krusader (Version 1.99.2.svn6248) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,12 +24,13 @@ Url: http://krusader.sourceforge.net/ License: GPL v2 or later Group: Productivity/File utilities Summary: A File Manager -Version: 1.99.1.svn6082 -Release: 7 +Version: 1.99.2.svn6248 +Release: 1 Requires: kio_iso = %version BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: krusader-2.0.0-beta2.tar.bz2 -Patch0: qt45.diff +Patch: trunk.diff.bz2 +Patch1: FIXME.diff %kde4_runtime_requires %description @@ -61,7 +62,8 @@ Authors: %prep %setup -n krusader-2.0.0-beta2 -%patch0 +%patch -p1 +%patch1 mv po/sr\@Latn.po po/sr\@latin.po %build @@ -84,7 +86,7 @@ popd %files -f %{name}.lang %defattr(-,root,root) -%doc README AUTHORS COPYING ChangeLog INSTALL TODO +%doc README AUTHORS COPYING ChangeLog INSTALL TODO SVNNEWS %_bindir/krusader %doc %lang(en) /usr/share/doc/kde/HTML/en/krusader %_kde_share_dir/apps/krusader @@ -100,6 +102,13 @@ popd %_kde_share_dir/services/iso.protocol %changelog +* Sat Mar 21 2009 beineri@opensuse.org +- added SVN trunk diff: + * archive dialog now remembers compression level + * changed default Alt+letter shortcuts, see details in SVNNEWS + * initial Konfigurator size is now 900x680 + * view properties for detailed/brief/interviews are merged + * several bugfixes * Fri Mar 06 2009 wstephenson@suse.de - make it compile vs Qt 4.5 * Sun Feb 01 2009 dmueller@suse.de diff --git a/qt45.diff b/qt45.diff deleted file mode 100644 index 6df5f57..0000000 --- a/qt45.diff +++ /dev/null @@ -1,11 +0,0 @@ -Index: krusader/ActionMan/actionproperty.ui -=================================================================== ---- krusader/ActionMan/actionproperty.ui (revision 6237) -+++ krusader/ActionMan/actionproperty.ui (revision 6238) -@@ -1,6 +1,5 @@ - - ActionProperty -- QWidget - - - diff --git a/trunk.diff.bz2 b/trunk.diff.bz2 new file mode 100644 index 0000000..226ee8c --- /dev/null +++ b/trunk.diff.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e406aad223a633f6ebf0bcff88e7af347a78dfb4826914673ba8d9d5fa7edde3 +size 205987