summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2011-12-10 15:47:53 +0100
committerFrancois Andriot <francois.andriot@free.fr>2011-12-10 15:47:53 +0100
commit24e232cf9a32067a490d6687344e068641ea7e26 (patch)
treeb76ec34a2f6654ea49e8d535485bbdc6883d0b41
parent0b0d138bbc895c01e392bf3fd6c4e916a86935a5 (diff)
downloadtde-packaging-24e232cf9a32067a490d6687344e068641ea7e26.tar.gz
tde-packaging-24e232cf9a32067a490d6687344e068641ea7e26.zip
RHEL/Fedora: enhance kdebase build, add patch to fix konqsidebar
-rw-r--r--redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch20
-rw-r--r--redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch4
-rw-r--r--redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch20
-rw-r--r--redhat/kdebase/kdebase-3.5.13-konqsidebar_documents.patch11
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.12.spec61
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.13.spec60
6 files changed, 103 insertions, 73 deletions
diff --git a/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch b/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch
index 5971553d1..442486efa 100644
--- a/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch
+++ b/redhat/kdebase/kdebase-3.5.12-konq_menu_tab_background.patch
@@ -1,6 +1,6 @@
diff -Nuar kcontrol.ORI/konqhtml/advancedTabDialog.cpp kcontrol/konqhtml/advancedTabDialog.cpp
---- kcontrol.ORI/konqhtml/advancedTabDialog.cpp 2011-12-09 23:45:04.676253975 +0100
-+++ kcontrol/konqhtml/advancedTabDialog.cpp 2011-12-09 23:46:28.239256986 +0100
+--- kdebase/kcontrol.ORI/konqhtml/advancedTabDialog.cpp 2011-12-09 23:45:04.676253975 +0100
++++ kdebase/kcontrol/konqhtml/advancedTabDialog.cpp 2011-12-09 23:46:28.239256986 +0100
@@ -58,7 +58,6 @@
layout->addSpacing( 20 );
layout->addStretch();
@@ -26,8 +26,8 @@ diff -Nuar kcontrol.ORI/konqhtml/advancedTabDialog.cpp kcontrol/konqhtml/advance
m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
diff -Nuar kcontrol.ORI/konqhtml/advancedTabOptions.ui kcontrol/konqhtml/advancedTabOptions.ui
---- kcontrol.ORI/konqhtml/advancedTabOptions.ui 2011-12-09 23:45:04.674267416 +0100
-+++ kcontrol/konqhtml/advancedTabOptions.ui 2011-12-09 23:56:01.440255647 +0100
+--- kdebase/kcontrol.ORI/konqhtml/advancedTabOptions.ui 2011-12-09 23:45:04.674267416 +0100
++++ kdebase/kcontrol/konqhtml/advancedTabOptions.ui 2011-12-09 23:56:01.440255647 +0100
@@ -62,6 +62,17 @@
</widget>
<widget class="QCheckBox">
@@ -47,8 +47,8 @@ diff -Nuar kcontrol.ORI/konqhtml/advancedTabOptions.ui kcontrol/konqhtml/advance
</property>
<property name="text">
diff -Nuar konqueror.ORI/konq_guiclients.cc konqueror/konq_guiclients.cc
---- konqueror.ORI/konq_guiclients.cc 2011-12-09 23:44:28.950255993 +0100
-+++ konqueror/konq_guiclients.cc 2011-12-09 23:49:31.432261289 +0100
+--- kdebase/konqueror.ORI/konq_guiclients.cc 2011-12-09 23:44:28.950255993 +0100
++++ kdebase/konqueror/konq_guiclients.cc 2011-12-09 23:49:31.432261289 +0100
@@ -115,6 +115,11 @@
openInTabElement.setAttribute( "group", "tabhandling" );
menu.appendChild( openInTabElement );
@@ -62,8 +62,8 @@ diff -Nuar konqueror.ORI/konq_guiclients.cc konqueror/konq_guiclients.cc
separatorElement.setAttribute( "group", "tabhandling" );
menu.appendChild( separatorElement );
diff -Nuar konqueror.ORI/konq_mainwindow.cc konqueror/konq_mainwindow.cc
---- konqueror.ORI/konq_mainwindow.cc 2011-12-09 23:44:29.030265039 +0100
-+++ konqueror/konq_mainwindow.cc 2011-12-09 23:54:27.518255409 +0100
+--- kdebase/konqueror.ORI/konq_mainwindow.cc 2011-12-09 23:44:29.030265039 +0100
++++ kdebase/konqueror/konq_mainwindow.cc 2011-12-09 23:54:27.518255409 +0100
@@ -2727,6 +2727,14 @@
openURL( 0L, popupItems.getFirst()->url() );
}
@@ -124,8 +124,8 @@ diff -Nuar konqueror.ORI/konq_mainwindow.cc konqueror/konq_mainwindow.cc
}
diff -Nuar konqueror.ORI/konq_mainwindow.h konqueror/konq_mainwindow.h
---- konqueror.ORI/konq_mainwindow.h 2011-12-09 23:44:28.941260682 +0100
-+++ konqueror/konq_mainwindow.h 2011-12-09 23:54:57.772255487 +0100
+--- kdebase/konqueror.ORI/konq_mainwindow.h 2011-12-09 23:44:28.941260682 +0100
++++ kdebase/konqueror/konq_mainwindow.h 2011-12-09 23:54:57.772255487 +0100
@@ -444,6 +444,7 @@
void slotPopupNewWindow();
void slotPopupThisWindow();
diff --git a/redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch b/redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch
index 0d0a873d9..dfe65563a 100644
--- a/redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch
+++ b/redhat/kdebase/kdebase-3.5.13-kio_man_utf8.patch
@@ -16,14 +16,14 @@
-
- const TQCString cstr=myStdStream.utf8();
- const int len = cstr.size()-1;
-+ QIODevice *fd= KFilterDev::deviceForFile(filename);
++ TQIODevice *fd= KFilterDev::deviceForFile(filename);
+
+ if ( !fd || !fd->open(IO_ReadOnly))
+ {
+ delete fd;
+ return 0;
+ }
-+ QByteArray array(fd->readAll());
++ TQByteArray array(fd->readAll());
+ kdDebug(7107) << "read " << array.size() << endl;
+ fd->close();
+ delete fd;
diff --git a/redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch b/redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch
index 6c182e29f..483b259c1 100644
--- a/redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch
+++ b/redhat/kdebase/kdebase-3.5.13-konq_menu_tab_background.patch
@@ -1,6 +1,6 @@
diff -urN /dev/shm/kdebase/kcontrol/konqhtml/advancedTabDialog.cpp /dev/shm/kdebase.new/kcontrol/konqhtml/advancedTabDialog.cpp
---- /dev/shm/kdebase/kcontrol/konqhtml/advancedTabDialog.cpp 2011-03-12 00:57:45.000000000 -0600
-+++ /dev/shm/kdebase.new/kcontrol/konqhtml/advancedTabDialog.cpp 2011-12-03 17:25:40.297586593 -0600
+--- kdebase/kcontrol/konqhtml/advancedTabDialog.cpp 2011-03-12 00:57:45.000000000 -0600
++++ kdebase.new/kcontrol/konqhtml/advancedTabDialog.cpp 2011-12-03 17:25:40.297586593 -0600
@@ -58,7 +58,6 @@
layout->addSpacing( 20 );
layout->addStretch();
@@ -26,8 +26,8 @@ diff -urN /dev/shm/kdebase/kcontrol/konqhtml/advancedTabDialog.cpp /dev/shm/kdeb
m_pConfig->writeEntry( "PermanentCloseButton", m_advancedWidget->m_pPermanentCloseButton->isChecked() );
m_pConfig->writeEntry( "KonquerorTabforExternalURL", m_advancedWidget->m_pKonquerorTabforExternalURL->isChecked() );
diff -urN /dev/shm/kdebase/kcontrol/konqhtml/advancedTabOptions.ui /dev/shm/kdebase.new/kcontrol/konqhtml/advancedTabOptions.ui
---- /dev/shm/kdebase/kcontrol/konqhtml/advancedTabOptions.ui 2011-03-12 00:57:45.000000000 -0600
-+++ /dev/shm/kdebase.new/kcontrol/konqhtml/advancedTabOptions.ui 2011-12-03 17:24:25.987334444 -0600
+--- kdebase/kcontrol/konqhtml/advancedTabOptions.ui 2011-03-12 00:57:45.000000000 -0600
++++ kdebase.new/kcontrol/konqhtml/advancedTabOptions.ui 2011-12-03 17:24:25.987334444 -0600
@@ -51,17 +51,6 @@
</property>
<widget class="TQCheckBox">
@@ -47,8 +47,8 @@ diff -urN /dev/shm/kdebase/kcontrol/konqhtml/advancedTabOptions.ui /dev/shm/kdeb
</property>
<property name="text">
diff -urN /dev/shm/kdebase/konqueror/konq_guiclients.cc /dev/shm/kdebase.new/konqueror/konq_guiclients.cc
---- /dev/shm/kdebase/konqueror/konq_guiclients.cc 2011-08-11 00:25:53.000000000 -0500
-+++ /dev/shm/kdebase.new/konqueror/konq_guiclients.cc 2011-12-03 17:24:25.987334444 -0600
+--- kdebase/konqueror/konq_guiclients.cc 2011-08-11 00:25:53.000000000 -0500
++++ kdebase.new/konqueror/konq_guiclients.cc 2011-12-03 17:24:25.987334444 -0600
@@ -104,8 +104,8 @@
openInSameWindow.setAttribute( "name", "sameview" );
openInSameWindow.setAttribute( "group", "tabhandling" );
@@ -73,8 +73,8 @@ diff -urN /dev/shm/kdebase/konqueror/konq_guiclients.cc /dev/shm/kdebase.new/kon
separatorElement.setAttribute( "group", "tabhandling" );
menu.appendChild( separatorElement );
diff -urN /dev/shm/kdebase/konqueror/konq_mainwindow.cc /dev/shm/kdebase.new/konqueror/konq_mainwindow.cc
---- /dev/shm/kdebase/konqueror/konq_mainwindow.cc 2011-08-20 02:14:06.000000000 -0500
-+++ /dev/shm/kdebase.new/konqueror/konq_mainwindow.cc 2011-12-03 17:24:25.994334609 -0600
+--- kdebase/konqueror/konq_mainwindow.cc 2011-08-20 02:14:06.000000000 -0500
++++ kdebase.new/konqueror/konq_mainwindow.cc 2011-12-03 17:24:25.994334609 -0600
@@ -2726,15 +2726,23 @@
openURL( 0L, popupItems.getFirst()->url() );
}
@@ -148,8 +148,8 @@ diff -urN /dev/shm/kdebase/konqueror/konq_mainwindow.cc /dev/shm/kdebase.new/kon
}
diff -urN /dev/shm/kdebase/konqueror/konq_mainwindow.h /dev/shm/kdebase.new/konqueror/konq_mainwindow.h
---- /dev/shm/kdebase/konqueror/konq_mainwindow.h 2011-03-12 00:58:18.000000000 -0600
-+++ /dev/shm/kdebase.new/konqueror/konq_mainwindow.h 2011-12-03 17:24:25.995334564 -0600
+--- kdebase/konqueror/konq_mainwindow.h 2011-03-12 00:58:18.000000000 -0600
++++ kdebase.new/konqueror/konq_mainwindow.h 2011-12-03 17:24:25.995334564 -0600
@@ -444,6 +444,7 @@
void slotPopupNewWindow();
void slotPopupThisWindow();
diff --git a/redhat/kdebase/kdebase-3.5.13-konqsidebar_documents.patch b/redhat/kdebase/kdebase-3.5.13-konqsidebar_documents.patch
new file mode 100644
index 000000000..e6076a12e
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-konqsidebar_documents.patch
@@ -0,0 +1,11 @@
+--- kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp.ORI 2011-12-10 15:07:43.171011925 +0100
++++ kdebase/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp 2011-12-10 15:07:48.000797355 +0100
+@@ -400,7 +400,7 @@
+ kdDebug(1201) << this << " KonqSidebarDirTreeModule::slotNewItems " << entries.count() << endl;
+
+ Q_ASSERT(entries.count());
+- KFileItem * firstItem = const_cast<KFileItemList&>(entries).first(); // qlist sucks for constness
++ KFileItem * firstItem = const_cast<KFileItemList&>(entries).last(); // qlist sucks for constness
+
+ // Find parent item - it's the same for all the items
+ KURL dir( firstItem->url().url(-1) );
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index 94332e782..0623081ba 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -53,41 +53,45 @@ Patch1: http://www.trinitydesktop.org/patches/r1201523.diff
# [kdebase/kcontrol] make it compatible with openssl < 1.0
Patch2: http://www.trinitydesktop.org/patches/r1201705.diff
# Fix My Documents shortcut on desktop
-Patch4: http://www.trinitydesktop.org/patches/r1182808.diff
+Patch3: http://www.trinitydesktop.org/patches/r1182808.diff
# [kdebase] fixed an incompatibility with gcc 4.5
-Patch8: http://www.trinitydesktop.org/patches/r1221326.diff
+Patch4: http://www.trinitydesktop.org/patches/r1221326.diff
# TDE Official patches (from SVN), modified
# [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2
-Patch12: kdebase-3.5.12-r1220975.patch
+Patch5: kdebase-3.5.12-r1220975.patch
# [kdebase] Another invalid constructor per gcc 4.5
-Patch9: kdebase-3.5.12-r1220927.patch
+Patch6: kdebase-3.5.12-r1220927.patch
+
+# TDE unofficial patches, fixing FTBFS
+## Fix for DBUS include files in RHEL6
+Patch7: kdebase-3.5.12-shutdowndlg-dbus-include.patch
+## [kdebase/kcontrol]: disable components that depends of krandr (old distros)
+Patch8: kdebase-3.5.12-disable-krandr.patch
# TDE for RHEL/Fedora specific patches
## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
-Patch3: kdebase-3.5.12-kdesu-noignorebutton.patch
+Patch10: kdebase-3.5.12-kdesu-noignorebutton.patch
## [kdebase/kdesktop] Modifies 'open terminal here' on desktop
-Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
+Patch11: kdebase-3.5.12-desktop-openterminalhere.patch
## [kdebase/kioslave] Forces HAL backend to use HAL mount options
-Patch6: kdebase-3.5.12-halmountoptions.patch
+Patch12: kdebase-3.5.12-halmountoptions.patch
## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
-Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch
+Patch13: kdebase-3.5.13-genkdmconf_Xsession_location.patch
## [kdebase/kicker/kicker/ui] Fix kickoff menu issues
-Patch10: kdebase-3.5.12-kickoff_unstable.patch
+Patch14: kdebase-3.5.12-kickoff_unstable.patch
## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
-Patch11: kdebase-3.5.13-startkde_icon.patch
+Patch15: kdebase-3.5.13-startkde_icon.patch
-# TDE 3.5.12 unofficial patches
-## Fix for DBUS include files in RHEL6
-Patch0: kdebase-3.5.12-shutdowndlg-dbus-include.patch
+# TDE unofficial patches for enhanced features
## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
-Patch13: kdebase-3.5.13-kate_mru.patch
+Patch20: kdebase-3.5.13-kate_mru.patch
## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db'
-Patch14: kdebase-3.5.12-kio_man_utf8.patch
-## [kdebase/kcontrol]: disable components that depends of krandr (old distros)
-Patch15: kdebase-3.5.12-disable-krandr.patch
+Patch21: kdebase-3.5.12-kio_man_utf8.patch
## [kdebase/konqueror] Re-enable 'open tab in background'
-Patch16: kdebase-3.5.12-konq_menu_tab_background.patch
+Patch22: kdebase-3.5.12-konq_menu_tab_background.patch
+## [kdebase/konqueror/sidebar] Fix error message on documents parent folder
+Patch23: kdebase-3.5.13-konqsidebar_documents.patch
# Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15
@@ -266,7 +270,6 @@ Protocol handlers (KIOslaves) for personal information management, including:
%prep
%setup -q -n kdebase
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -274,19 +277,23 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%if 0%{?rhel} && 0%{?rhel} < 6
%patch8 -p1
-%patch9 -p1
+%endif
+
%patch10 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p4
-%if 0%{?rhel} > 0
+%patch13 -p1
%patch14 -p1
-%endif
-%if 0%{?rhel} && 0%{?rhel} < 6
%patch15 -p1
+
+%patch20 -p4
+%if 0%{?rhel} > 0
+%patch21 -p1
%endif
-%patch16 -p0
+%patch22 -p1
+%patch23 -p1
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
@@ -623,7 +630,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
# TDE 3.5.12 specific
%{_bindir}/kde3
-%exclude %{_datadir}/applications/kde/display.desktop
+#%exclude
+%{_datadir}/applications/kde/display.desktop
%exclude %{_datadir}/fonts/override/fonts.dir
%{_docdir}/kdm/README
@@ -665,6 +673,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
- Fix 'kio_man' on RHEL 5 and RHEL 6 [TDE Bug #714]
- Restores the 'number of files' and sorting widgets to the Kate configuration [TDE Bug #244]
- Re-enables 'open tab in background' konqueror feature [TDE Bug #245]
+- Fix error message 'cannot find parent folder' on konqueror sidebar
* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-12
- Updates Kickoff menu Fix [TDE Bugs #281, #508]
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index b2ce04637..41937187a 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 10
+%define release 11
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -53,33 +53,37 @@ Source5: pamd.kscreensaver-trinity%{?dist}
# TDE Official patches (from SVN), modified
# (none)
+# TDE unofficial patches, fixing FTBFS
+## [kdebase/kdm] adds gcrypt support
+Patch7: kdebase-3.5.13-kdm-crypt.patch
+## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
+Patch8: kdebase-3.5.13-mediamanager_ftbfs.patch
+## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
+Patch9: kdebase-3.5.13-startkde_ldpreload.patch
+
# TDE for RHEL/Fedora specific patches
## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
-Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch
-## [kdebase/kdesktop] Modifies "open terminal here" on desktop
-Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
+Patch10: kdebase-3.5.13-kdesu-noignorebutton.patch
+## [kdebase/kdesktop] Modifies 'open terminal here' on desktop
+Patch11: kdebase-3.5.12-desktop-openterminalhere.patch
## [kdebase/kioslave] Forces HAL backend to use HAL mount options
-Patch6: kdebase-3.5.12-halmountoptions.patch
+Patch12: kdebase-3.5.12-halmountoptions.patch
## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
-Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch
-## [kdebase/kicker/kicker/ui]
-Patch10: kdebase-3.5.13-kickoff_unstable.patch
+Patch13: kdebase-3.5.13-genkdmconf_Xsession_location.patch
+## [kdebase/kicker/kicker/ui] Fix kickoff menu issues
+Patch14: kdebase-3.5.13-kickoff_unstable.patch
## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
-Patch11: kdebase-3.5.13-startkde_icon.patch
+Patch15: kdebase-3.5.13-startkde_icon.patch
-# TDE 3.5.13 patches
-## [kdebase/kdm] adds gcrypt support
-Patch12: kdebase-3.5.13-kdm-crypt.patch
-## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
-Patch8: kdebase-3.5.13-startkde_ldpreload.patch
-## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
-Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch
+# TDE unofficial patches for enhanced features
## [kdebase/kate] Restores the 'number of files' and sorting widgets to the Kate configuration
-Patch13: kdebase-3.5.13-kate_mru.patch
+Patch20: kdebase-3.5.13-kate_mru.patch
## [kdebase/kioslave/man] Fix kio_man for older distros without 'man-db'
-Patch14: kdebase-3.5.13-kio_man_utf8.patch
+Patch21: kdebase-3.5.13-kio_man_utf8.patch
## [kdebase/konqueror] Re-enable 'open tab in background'
-Patch15: kdebase-3.5.13-konq_menu_tab_background.patch
+Patch22: kdebase-3.5.13-konq_menu_tab_background.patch
+## [kdebase/konqueror/sidebar] Fix error message on documents parent folder
+Patch23: kdebase-3.5.13-konqsidebar_documents.patch
# Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15
@@ -258,20 +262,23 @@ Protocol handlers (KIOslaves) for personal information management, including:
%prep
%setup -q -n kdebase
-%patch3 -p1
-%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
+
%patch10 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p4
-%if 0%{?rhel} > 0
+%patch13 -p1
%patch14 -p1
+%patch15 -p1
+
+%patch20 -p4
+%if 0%{?rhel} > 0
+%patch21 -p1
%endif
-%patch15 -p4
+%patch22 -p1
+%patch23 -p1
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
@@ -656,6 +663,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/cmake/*.cmake
%changelog
+* Sat Dec 10 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-11
+- Fix error message 'cannot find parent folder' on konqueror sidebar
+
* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-10
- Removes Kubuntu branding [TDE Bug #449]
- Re-enables 'open tab in background' konqueror feature [TDE Bug #245]