RPM Packaging: lots of updates for 3.5.13.2

2 files changed, 1045 insertions, 87 deletions

diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch
new file mode 100644
index 000000000..822e74210
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-3.5.13.2-fix_xdg_menu.patch
@@ -0,0 +1,976 @@
+diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu trinity-tdelibs-3.5.13.2/kded/applications.menu
+--- trinity-tdelibs-3.5.13.2/kded.ORI/applications.menu	2013-07-28 15:03:29.861478619 +0200
++++ trinity-tdelibs-3.5.13.2/kded/applications.menu	1970-01-01 01:00:00.000000000 +0100
+@@ -1,472 +0,0 @@
+-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+-  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+-
+-<Menu>
+-  <Name>Applications</Name>
+-  <Directory>kde-main.directory</Directory>
+-  <!-- Search the default locations -->
+-  <KDELegacyDirs/>
+-  <DefaultAppDirs/>
+-  <DefaultDirectoryDirs/>
+-  <DefaultLayout>
+-    <Merge type="menus"/>
+-    <Merge type="files"/>
+-    <Separator/>
+-    <Menuname>More</Menuname>
+-  </DefaultLayout>
+-  <Layout>
+-    <Merge type="menus"/>
+-    <Menuname>Applications</Menuname>
+-    <Merge type="files"/>
+-  </Layout>
+-
+-  <Menu>
+-    <Name>Applications</Name>
+-    <Directory>kde-unknown.directory</Directory>
+-    <OnlyUnallocated/>
+-    <Include>
+-      <Not>
+-        <!-- Don't list non-KDE core applications -->
+-        <And>
+-          <Category>Core</Category>
+-          <Not><Category>KDE</Category></Not>
+-        </And>
+-        <!-- Don't list SUSE's YaST in here -->
+-        <Category>X-SuSE-YaST</Category>
+-      </Not>
+-    </Include>
+-  </Menu>
+-  <Menu>
+-    <Name>Development</Name>
+-    <Directory>kde-development.directory</Directory>
+-    <Menu>
+-      <Name>X-KDE-KDevelopIDE</Name>
+-      <Directory>kde-development-kdevelop.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Development</Category>
+-        <Category>X-KDE-KDevelopIDE</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Translation</Name>
+-      <Directory>kde-development-translation.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Development</Category>
+-        <Category>Translation</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Web Development</Name>
+-      <Directory>kde-development-webdevelopment.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Development</Category>
+-        <Category>WebDevelopment</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-      <Include>
+-        <And>
+-        <Category>Development</Category>
+-        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
+-        <Not><Category>Translation</Category></Not>
+-        <Not><Category>WebDevelopment</Category></Not>
+-        </And>
+-      </Include>
+-  </Menu>
+-  <Menu>
+-    <Name>Science</Name>
+-    <Directory>kde-science.directory</Directory>
+-    <Include>
+-      <And><!-- Include /any/ Science app which is not an Education app -->
+-        <Or>
+-          <Category>Astronomy</Category>
+-          <Category>Biology</Category>
+-          <Category>Chemistry</Category>
+-          <Category>Geology</Category>
+-          <Category>MedicalSoftware</Category>
+-          <Category>Physics</Category>
+-          <Category>Math</Category>
+-          <Category>Science</Category>
+-        </Or>
+-        <Not><Category>Education</Category></Not>
+-      </And>
+-    </Include>
+-  </Menu>
+-  <Menu>
+-    <Name>Edutainment</Name>
+-    <Directory>kde-edutainment.directory</Directory>
+-    <Menu>
+-      <Name>Languages</Name>
+-      <Directory>kde-edu-languages.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Education</Category>
+-        <Or>
+-        <Category>Languages</Category>
+-        <Category>X-KDE-Edu-Language</Category>
+-        </Or>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Mathematics</Name>
+-      <Directory>kde-edu-mathematics.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Education</Category>
+-        <Category>Math</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Miscellaneous</Name>
+-      <Directory>kde-edu-miscellaneous.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Education</Category>
+-        <Not>
+-        <Category>Languages</Category>
+-        <Category>X-KDE-Edu-Language</Category>
+-        <Category>Math</Category>
+-        <Category>Science</Category>
+-        <Category>Teaching</Category>
+-        <Category>X-KDE-Edu-Teaching</Category>
+-        </Not>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Science</Name>
+-      <Directory>kde-edu-science.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Education</Category>
+-        <Category>Science</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Tools</Name>
+-      <Directory>kde-edu-tools.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Education</Category>
+-        <Or>
+-        <Category>Teaching</Category>
+-        <Category>X-KDE-Edu-Teaching</Category>
+-        </Or>
+-        </And>
+-      </Include>
+-    </Menu>
+-  </Menu>
+-  <Menu>
+-    <Name>Games</Name>
+-    <Directory>kde-games.directory</Directory>
+-    <Menu>
+-      <Name>Arcade</Name>
+-      <Directory>kde-games-arcade.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Game</Category>
+-        <Category>ArcadeGame</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Board</Name>
+-      <Directory>kde-games-board.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Game</Category>
+-        <Category>BoardGame</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Card</Name>
+-      <Directory>kde-games-card.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Game</Category>
+-        <Category>CardGame</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Kidsgames</Name>
+-      <Directory>kde-games-kids.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Game</Category>
+-        <Or>
+-        <Category>X-KDE-KidsGame</Category>
+-        <Category>KidsGame</Category>
+-        </Or>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>TacticStrategy</Name>
+-      <Directory>kde-games-strategy.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Game</Category>
+-        <Category>StrategyGame</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Include>
+-      <And>
+-      <Category>Game</Category>
+-      <Not>
+-      <Category>ArcadeGame</Category>
+-      <Category>BoardGame</Category>
+-      <Category>CardGame</Category>
+-      <Category>X-KDE-KidsGame</Category>
+-      <Category>KidsGame</Category>
+-      <Category>StrategyGame</Category>
+-      </Not>
+-      </And>
+-    </Include>
+-  </Menu>
+-  <Menu>
+-    <Name>Graphics</Name>
+-    <Directory>kde-graphics.directory</Directory>
+-    <Include>
+-      <And>
+-      <Category>Graphics</Category>
+-      <Not><Category>X-KDE-More</Category></Not>
+-      <Not><Filename>ooo-draw.desktop</Filename></Not>
+-      </And>
+-    </Include>
+-    <Menu>
+-      <Name>More</Name>
+-      <Directory>kde-more.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Graphics</Category>
+-        <Category>X-KDE-More</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-  </Menu>
+-  <Menu>
+-    <Name>Internet</Name>
+-    <Directory>kde-internet.directory</Directory>
+-    <Include>
+-      <And>
+-      <Category>Network</Category>
+-      <Not><Category>X-KDE-More</Category></Not>
+-      </And>
+-    </Include>
+-    <Menu>
+-      <Name>Terminal</Name>
+-      <Directory>kde-internet-terminal.directory</Directory>
+-    </Menu>
+-    <Menu>
+-      <Name>More</Name>
+-      <Directory>kde-more.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Network</Category>
+-        <Category>X-KDE-More</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-  </Menu>
+-  <Menu>
+-    <Name>Multimedia</Name>
+-    <Directory>kde-multimedia.directory</Directory>
+-    <Include>
+-      <And>
+-      <Category>AudioVideo</Category>
+-      <Not><Category>X-KDE-More</Category></Not>
+-      </And>
+-    </Include>
+-    <Menu>
+-      <Name>More</Name>
+-      <Directory>kde-more.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>AudioVideo</Category>
+-        <Category>X-KDE-More</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-  </Menu>
+-  <Menu>
+-    <Name>Office</Name>
+-    <Directory>kde-office.directory</Directory>
+-    <Layout>
+-      <Merge type="menus"/>
+-      <Merge type="files"/>
+-      <Separator/>
+-      <Menuname>More</Menuname>
+-    </Layout>
+-    <Include>
+-      <And>
+-      <Category>Office</Category>
+-        <Not><Category>X-KDE-More</Category></Not>
+-      </And>
+-    <Filename>ooo-draw.desktop</Filename>
+-    </Include>
+-    <Menu>
+-      <Name>More</Name>
+-      <Directory>kde-more.directory</Directory>
+-      <Include>
+-        <And>
+-          <Category>Office</Category>
+-          <Category>X-KDE-More</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-  </Menu>
+-  <Menu>
+-    <Name>Settingsmenu</Name>
+-    <Directory>kde-settingsmenu.directory</Directory>
+-    <Include>
+-      <Category>Settings</Category>
+-    </Include>
+-  </Menu>
+-  <Menu>
+-    <Name>System</Name>
+-    <Directory>kde-system.directory</Directory>
+-    <Include>
+-      <And>
+-      <Category>System</Category>
+-      <Not><Category>X-KDE-More</Category></Not>
+-      </And>
+-    </Include>
+-    <Menu>
+-      <Name>SuperUser</Name>
+-      <Directory>kde-system-su.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>X-KDE-System-su</Category>
+-        <Not><Category>X-KDE-More</Category></Not>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>More</Name>
+-      <Directory>kde-more.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>System</Category>
+-        <Category>X-KDE-More</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>ScreenSavers</Name>
+-      <Directory>kde-system-screensavers.directory</Directory>
+-    </Menu>
+-    <Menu>
+-      <Name>Terminal</Name>
+-      <Directory>kde-system-terminal.directory</Directory>
+-    </Menu>
+-  </Menu>
+-  <Menu>
+-    <Name>Utilities</Name>
+-    <Directory>kde-utilities.directory</Directory>
+-    <Include>
+-      <And>
+-      <Category>Utility</Category>
+-      <Not><Category>Accessibility</Category></Not>
+-      <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
+-      <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
+-      <Not><Category>X-KDE-Utilities-PIM</Category></Not>
+-      <Not><Category>X-KDE-More</Category></Not>
+-      </And>
+-    </Include>
+-    <Menu>
+-      <Name>Accessibility</Name>
+-      <Directory>kde-utilities-accessibility.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Utility</Category>
+-        <Category>Accessibility</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Desktop</Name>
+-      <Directory>kde-utilities-desktop.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Utility</Category>
+-        <Category>X-KDE-Utilities-Desktop</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Editors</Name>
+-      <Directory>kde-editors.directory</Directory>
+-      <Include>
+-        <Category>TextEditor</Category>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>PIM</Name>
+-      <Directory>kde-utilities-pim.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Utility</Category>
+-        <Category>X-KDE-Utilities-PIM</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>Toys</Name>
+-      <Directory>kde-toys.directory</Directory>
+-      <Include>
+-        <Category>Amusement</Category>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>XUtilities</Name>
+-      <Directory>kde-utilities-xutils.directory</Directory>
+-    </Menu>
+-    <Menu>
+-      <Name>More</Name>
+-      <Directory>kde-more.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Utility</Category>
+-        <Category>X-KDE-More</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-    <Menu>
+-      <Name>More</Name>
+-      <Directory>kde-more.directory</Directory>
+-      <Include>
+-        <And>
+-        <Category>Utility</Category>
+-        <Category>X-KDE-More</Category>
+-        </And>
+-      </Include>
+-    </Menu>
+-  </Menu>
+-  <Include>
+-    <And>
+-    <Category>KDE</Category>
+-    <Category>Core</Category>
+-    </And>
+-  </Include>
+-  <DefaultMergeDirs/>
+-
+-  <Menu>
+-    <Name>Debian</Name>
+-    <Directory>debian.directory</Directory>
+-    <MergeFile>debian-menu.menu</MergeFile>
+-  </Menu>
+-
+-  <MergeDir>applications-merged</MergeDir>
+-  <MergeFile>applications-kmenuedit.menu</MergeFile>
+-</Menu>
+diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt
+--- trinity-tdelibs-3.5.13.2/kded.ORI/CMakeLists.txt	2013-07-28 15:03:29.861478619 +0200
++++ trinity-tdelibs-3.5.13.2/kded/CMakeLists.txt	2013-07-28 15:03:45.806126508 +0200
+@@ -35,7 +35,7 @@
+ ##### other data ################################
+ 
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+-install( FILES applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
++install( FILES tde-applications.menu DESTINATION ${XDG_MENU_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
+ 
+ 
+diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp
+--- trinity-tdelibs-3.5.13.2/kded.ORI/kbuildsycoca.cpp	2013-07-28 15:03:29.861478619 +0200
++++ trinity-tdelibs-3.5.13.2/kded/kbuildsycoca.cpp	2013-07-28 15:04:11.314563211 +0200
+@@ -379,7 +379,7 @@
+      connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)),
+              this, TQT_SLOT(slotCreateEntry(const TQString &, KService **)));
+              
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true);
+ 
+      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
+      entry->setLayoutInfo(kdeMenu->layoutList);
+diff -Nuar trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu trinity-tdelibs-3.5.13.2/kded/tde-applications.menu
+--- trinity-tdelibs-3.5.13.2/kded.ORI/tde-applications.menu	1970-01-01 01:00:00.000000000 +0100
++++ trinity-tdelibs-3.5.13.2/kded/tde-applications.menu	2013-06-07 19:23:04.000000000 +0200
+@@ -0,0 +1,472 @@
++<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
++  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
++
++<Menu>
++  <Name>Applications</Name>
++  <Directory>tde-main.directory</Directory>
++  <!-- Search the default locations -->
++  <KDELegacyDirs/>
++  <DefaultAppDirs/>
++  <DefaultDirectoryDirs/>
++  <DefaultLayout>
++    <Merge type="menus"/>
++    <Merge type="files"/>
++    <Separator/>
++    <Menuname>More</Menuname>
++  </DefaultLayout>
++  <Layout>
++    <Merge type="menus"/>
++    <Menuname>Applications</Menuname>
++    <Merge type="files"/>
++  </Layout>
++
++  <Menu>
++    <Name>Applications</Name>
++    <Directory>tde-unknown.directory</Directory>
++    <OnlyUnallocated/>
++    <Include>
++      <Not>
++        <!-- Don't list non-KDE core applications -->
++        <And>
++          <Category>Core</Category>
++          <Not><Category>KDE</Category></Not>
++        </And>
++        <!-- Don't list SUSE's YaST in here -->
++        <Category>X-SuSE-YaST</Category>
++      </Not>
++    </Include>
++  </Menu>
++  <Menu>
++    <Name>Development</Name>
++    <Directory>tde-development.directory</Directory>
++    <Menu>
++      <Name>X-KDE-KDevelopIDE</Name>
++      <Directory>tde-development-kdevelop.directory</Directory>
++      <Include>
++        <And>
++        <Category>Development</Category>
++        <Category>X-KDE-KDevelopIDE</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Translation</Name>
++      <Directory>tde-development-translation.directory</Directory>
++      <Include>
++        <And>
++        <Category>Development</Category>
++        <Category>Translation</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Web Development</Name>
++      <Directory>tde-development-webdevelopment.directory</Directory>
++      <Include>
++        <And>
++        <Category>Development</Category>
++        <Category>WebDevelopment</Category>
++        </And>
++      </Include>
++    </Menu>
++      <Include>
++        <And>
++        <Category>Development</Category>
++        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
++        <Not><Category>Translation</Category></Not>
++        <Not><Category>WebDevelopment</Category></Not>
++        </And>
++      </Include>
++  </Menu>
++  <Menu>
++    <Name>Science</Name>
++    <Directory>tde-science.directory</Directory>
++    <Include>
++      <And><!-- Include /any/ Science app which is not an Education app -->
++        <Or>
++          <Category>Astronomy</Category>
++          <Category>Biology</Category>
++          <Category>Chemistry</Category>
++          <Category>Geology</Category>
++          <Category>MedicalSoftware</Category>
++          <Category>Physics</Category>
++          <Category>Math</Category>
++          <Category>Science</Category>
++        </Or>
++        <Not><Category>Education</Category></Not>
++      </And>
++    </Include>
++  </Menu>
++  <Menu>
++    <Name>Edutainment</Name>
++    <Directory>tde-edutainment.directory</Directory>
++    <Menu>
++      <Name>Languages</Name>
++      <Directory>tde-edu-languages.directory</Directory>
++      <Include>
++        <And>
++        <Category>Education</Category>
++        <Or>
++        <Category>Languages</Category>
++        <Category>X-KDE-Edu-Language</Category>
++        </Or>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Mathematics</Name>
++      <Directory>tde-edu-mathematics.directory</Directory>
++      <Include>
++        <And>
++        <Category>Education</Category>
++        <Category>Math</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Miscellaneous</Name>
++      <Directory>tde-edu-miscellaneous.directory</Directory>
++      <Include>
++        <And>
++        <Category>Education</Category>
++        <Not>
++        <Category>Languages</Category>
++        <Category>X-KDE-Edu-Language</Category>
++        <Category>Math</Category>
++        <Category>Science</Category>
++        <Category>Teaching</Category>
++        <Category>X-KDE-Edu-Teaching</Category>
++        </Not>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Science</Name>
++      <Directory>tde-edu-science.directory</Directory>
++      <Include>
++        <And>
++        <Category>Education</Category>
++        <Category>Science</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Tools</Name>
++      <Directory>tde-edu-tools.directory</Directory>
++      <Include>
++        <And>
++        <Category>Education</Category>
++        <Or>
++        <Category>Teaching</Category>
++        <Category>X-KDE-Edu-Teaching</Category>
++        </Or>
++        </And>
++      </Include>
++    </Menu>
++  </Menu>
++  <Menu>
++    <Name>Games</Name>
++    <Directory>tde-games.directory</Directory>
++    <Menu>
++      <Name>Arcade</Name>
++      <Directory>tde-games-arcade.directory</Directory>
++      <Include>
++        <And>
++        <Category>Game</Category>
++        <Category>ArcadeGame</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Board</Name>
++      <Directory>tde-games-board.directory</Directory>
++      <Include>
++        <And>
++        <Category>Game</Category>
++        <Category>BoardGame</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Card</Name>
++      <Directory>tde-games-card.directory</Directory>
++      <Include>
++        <And>
++        <Category>Game</Category>
++        <Category>CardGame</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Kidsgames</Name>
++      <Directory>tde-games-kids.directory</Directory>
++      <Include>
++        <And>
++        <Category>Game</Category>
++        <Or>
++        <Category>X-KDE-KidsGame</Category>
++        <Category>KidsGame</Category>
++        </Or>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>TacticStrategy</Name>
++      <Directory>tde-games-strategy.directory</Directory>
++      <Include>
++        <And>
++        <Category>Game</Category>
++        <Category>StrategyGame</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Include>
++      <And>
++      <Category>Game</Category>
++      <Not>
++      <Category>ArcadeGame</Category>
++      <Category>BoardGame</Category>
++      <Category>CardGame</Category>
++      <Category>X-KDE-KidsGame</Category>
++      <Category>KidsGame</Category>
++      <Category>StrategyGame</Category>
++      </Not>
++      </And>
++    </Include>
++  </Menu>
++  <Menu>
++    <Name>Graphics</Name>
++    <Directory>tde-graphics.directory</Directory>
++    <Include>
++      <And>
++      <Category>Graphics</Category>
++      <Not><Category>X-KDE-More</Category></Not>
++      <Not><Filename>ooo-draw.desktop</Filename></Not>
++      </And>
++    </Include>
++    <Menu>
++      <Name>More</Name>
++      <Directory>tde-more.directory</Directory>
++      <Include>
++        <And>
++        <Category>Graphics</Category>
++        <Category>X-KDE-More</Category>
++        </And>
++      </Include>
++    </Menu>
++  </Menu>
++  <Menu>
++    <Name>Internet</Name>
++    <Directory>tde-internet.directory</Directory>
++    <Include>
++      <And>
++      <Category>Network</Category>
++      <Not><Category>X-KDE-More</Category></Not>
++      </And>
++    </Include>
++    <Menu>
++      <Name>Terminal</Name>
++      <Directory>tde-internet-terminal.directory</Directory>
++    </Menu>
++    <Menu>
++      <Name>More</Name>
++      <Directory>tde-more.directory</Directory>
++      <Include>
++        <And>
++        <Category>Network</Category>
++        <Category>X-KDE-More</Category>
++        </And>
++      </Include>
++    </Menu>
++  </Menu>
++  <Menu>
++    <Name>Multimedia</Name>
++    <Directory>tde-multimedia.directory</Directory>
++    <Include>
++      <And>
++      <Category>AudioVideo</Category>
++      <Not><Category>X-KDE-More</Category></Not>
++      </And>
++    </Include>
++    <Menu>
++      <Name>More</Name>
++      <Directory>tde-more.directory</Directory>
++      <Include>
++        <And>
++        <Category>AudioVideo</Category>
++        <Category>X-KDE-More</Category>
++        </And>
++      </Include>
++    </Menu>
++  </Menu>
++  <Menu>
++    <Name>Office</Name>
++    <Directory>tde-office.directory</Directory>
++    <Layout>
++      <Merge type="menus"/>
++      <Merge type="files"/>
++      <Separator/>
++      <Menuname>More</Menuname>
++    </Layout>
++    <Include>
++      <And>
++      <Category>Office</Category>
++        <Not><Category>X-KDE-More</Category></Not>
++      </And>
++    <Filename>ooo-draw.desktop</Filename>
++    </Include>
++    <Menu>
++      <Name>More</Name>
++      <Directory>tde-more.directory</Directory>
++      <Include>
++        <And>
++          <Category>Office</Category>
++          <Category>X-KDE-More</Category>
++        </And>
++      </Include>
++    </Menu>
++  </Menu>
++  <Menu>
++    <Name>Settingsmenu</Name>
++    <Directory>tde-settingsmenu.directory</Directory>
++    <Include>
++      <Category>Settings</Category>
++    </Include>
++  </Menu>
++  <Menu>
++    <Name>System</Name>
++    <Directory>tde-system.directory</Directory>
++    <Include>
++      <And>
++      <Category>System</Category>
++      <Not><Category>X-KDE-More</Category></Not>
++      </And>
++    </Include>
++    <Menu>
++      <Name>SuperUser</Name>
++      <Directory>tde-system-su.directory</Directory>
++      <Include>
++        <And>
++        <Category>X-KDE-System-su</Category>
++        <Not><Category>X-KDE-More</Category></Not>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>More</Name>
++      <Directory>tde-more.directory</Directory>
++      <Include>
++        <And>
++        <Category>System</Category>
++        <Category>X-KDE-More</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>ScreenSavers</Name>
++      <Directory>tde-system-screensavers.directory</Directory>
++    </Menu>
++    <Menu>
++      <Name>Terminal</Name>
++      <Directory>tde-system-terminal.directory</Directory>
++    </Menu>
++  </Menu>
++  <Menu>
++    <Name>Utilities</Name>
++    <Directory>tde-utilities.directory</Directory>
++    <Include>
++      <And>
++      <Category>Utility</Category>
++      <Not><Category>Accessibility</Category></Not>
++      <Not><Category>X-KDE-Utilities-Desktop</Category></Not>
++      <Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
++      <Not><Category>X-KDE-Utilities-PIM</Category></Not>
++      <Not><Category>X-KDE-More</Category></Not>
++      </And>
++    </Include>
++    <Menu>
++      <Name>Accessibility</Name>
++      <Directory>tde-utilities-accessibility.directory</Directory>
++      <Include>
++        <And>
++        <Category>Utility</Category>
++        <Category>Accessibility</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Desktop</Name>
++      <Directory>tde-utilities-desktop.directory</Directory>
++      <Include>
++        <And>
++        <Category>Utility</Category>
++        <Category>X-KDE-Utilities-Desktop</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Editors</Name>
++      <Directory>tde-editors.directory</Directory>
++      <Include>
++        <Category>TextEditor</Category>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>PIM</Name>
++      <Directory>tde-utilities-pim.directory</Directory>
++      <Include>
++        <And>
++        <Category>Utility</Category>
++        <Category>X-KDE-Utilities-PIM</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>Toys</Name>
++      <Directory>tde-toys.directory</Directory>
++      <Include>
++        <Category>Amusement</Category>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>XUtilities</Name>
++      <Directory>tde-utilities-xutils.directory</Directory>
++    </Menu>
++    <Menu>
++      <Name>More</Name>
++      <Directory>tde-more.directory</Directory>
++      <Include>
++        <And>
++        <Category>Utility</Category>
++        <Category>X-KDE-More</Category>
++        </And>
++      </Include>
++    </Menu>
++    <Menu>
++      <Name>More</Name>
++      <Directory>tde-more.directory</Directory>
++      <Include>
++        <And>
++        <Category>Utility</Category>
++        <Category>X-KDE-More</Category>
++        </And>
++      </Include>
++    </Menu>
++  </Menu>
++  <Include>
++    <And>
++    <Category>KDE</Category>
++    <Category>Core</Category>
++    </And>
++  </Include>
++  <DefaultMergeDirs/>
++
++  <Menu>
++    <Name>Debian</Name>
++    <Directory>debian.directory</Directory>
++    <MergeFile>debian-menu.menu</MergeFile>
++  </Menu>
++
++  <MergeDir>applications-merged</MergeDir>
++  <MergeFile>applications-kmenuedit.menu</MergeFile>
++</Menu>
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index ec061213a..4fe30cdb5 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -3,7 +3,9 @@
 %define _variant .opt
 %endif
 
-# TDE 3.5.13 specific variables
+%define tde_version 3.5.13.2
+
+# TDE specific variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -17,8 +19,8 @@
 %define _docdir %{tde_docdir}
 
 Name:		trinity-tdelibs
-Version:	3.5.13.2
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Version:	%{tde_version}
+Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
 License:	GPL
 Summary:	TDE Libraries
 Group:		Environment/Libraries
@@ -31,9 +33,12 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+# Fix categories in T-menu
+Patch1:		tdelibs-3.5.13.2-fix_xdg_menu.patch
 
-Patch1:		tdelibs-3.5.13.2-xdg_dirs_set_path.patch
-Patch2:		tdelibs-3.5.13.2-cups_by_default.patch
+# Patches from Mandriva
+Patch101:		tdelibs-3.5.13.2-xdg_dirs_set_path.patch
+Patch102:		tdelibs-3.5.13.2-cups_by_default.patch
 
 Obsoletes:	tdelibs < %{version}-%{release}
 Provides:	tdelibs = %{version}-%{release}
@@ -45,13 +50,12 @@ Provides:	trinity-kdelibs-apidocs = %{version}-%{release}
 
 BuildRequires:	cmake >= 2.8
 BuildRequires:	libtool
-BuildRequires:	qt3-devel
-BuildRequires:	trinity-tqtinterface-devel >= %{version}
-BuildRequires:	trinity-arts-devel >= %{version}
+BuildRequires:	qt3-devel >= 3.3.8.d
+BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
+BuildRequires:	trinity-arts-devel >= %{tde_version}
 BuildRequires:	krb5-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	cups-devel
-BuildRequires:	libart_lgpl-devel
 BuildRequires:	openssl-devel
 BuildRequires:	gcc-c++
 BuildRequires:	alsa-lib-devel
@@ -61,6 +65,9 @@ BuildRequires:	glib2-devel
 # LUA support are not ready yet
 #BuildRequires:	lua-devel
 
+# LIBART_LGPL support
+BuildRequires:	libart_lgpl-devel
+
 # ASPELL support
 BuildRequires:	aspell
 BuildRequires:	aspell-devel
@@ -124,7 +131,7 @@ BuildRequires:	jasper-devel
 # AVAHI support
 %if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_avahi 1
-BuildRequires:	trinity-avahi-tqt-devel >= %{version}
+BuildRequires:	trinity-avahi-tqt-devel >= %{tde_version}
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}avahi-client-devel
 Requires:		%{_lib}avahi-client3
@@ -189,9 +196,21 @@ BuildRequires:	xz-devel
 %endif
 %endif
 
-Requires:		trinity-tqtinterface >= %{version}
-Requires:		trinity-arts >= %{version}
+# Certificates support
+%if 0%{?rhel} || 0%{?fedora}
+%define	cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
+Requires:		ca-certificates
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define	cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
+Requires:		openssl
+%endif
+
+# Trinity dependencies
 Requires:		qt3 >= 3.3.8.d
+Requires:		trinity-tqtinterface >= %{tde_version}
+Requires:		trinity-arts >= %{tde_version}
+
 
 %description
 Libraries for the Trinity Desktop Environment:
@@ -231,6 +250,7 @@ kimgio (image manipulation).
 %{tde_bindir}/kdeinit_shutdown
 %{tde_bindir}/kdeinit_wrapper
 %{tde_bindir}/kdesu_stub
+%{tde_bindir}/kdetcompmgr
 %{tde_bindir}/kdontchangethehostname
 %{tde_bindir}/kdostartupconfig
 %{tde_bindir}/kfile
@@ -259,10 +279,14 @@ kimgio (image manipulation).
 %{tde_bindir}/start_kdeinit
 %{tde_bindir}/start_kdeinit_wrapper
 %attr(4755,root,root) %{tde_bindir}/kgrantpty
+%{tde_bindir}/checkXML
+%{tde_bindir}/ksvgtopng
+%{tde_bindir}/kunittestmodrunner
+%{tde_bindir}/preparetips
 %{tde_tdelibdir}/*
 %{tde_libdir}/lib*.so.*
-%{tde_libdir}/lib[kt]deinit_*.la
-%{tde_libdir}/lib[kt]deinit_*.so
+%{tde_libdir}/libkdeinit_*.la
+%{tde_libdir}/libkdeinit_*.so
 %{tde_datadir}/applications/kde/*.desktop
 %{tde_datadir}/autostart/kab2kabc.desktop
 %{tde_datadir}/applnk/kio_iso.desktop
@@ -270,48 +294,19 @@ kimgio (image manipulation).
 %exclude %{tde_datadir}/apps/ksgmltools2/
 %config(noreplace) %{tde_datadir}/config/*
 %{tde_datadir}/emoticons/*
+%{tde_datadir}/icons/crystalsvg/
 %{tde_datadir}/icons/default.kde
-%{_sysconfdir}/alternatives/default.kde
+%{tde_datadir}/icons/hicolor/index.theme
+%{tde_datadir}/locale/all_languages
 %{tde_datadir}/mimelnk/magic
 %{tde_datadir}/mimelnk/*/*.desktop
 %{tde_datadir}/services/*
 %{tde_datadir}/servicetypes/*
-%{tde_datadir}/icons/crystalsvg/
-%{tde_tdedocdir}/HTML/en/kspell/
-# remove conflicts with kdelibs-4
-%if "%{?tde_prefix}" != "/usr"
-%{tde_bindir}/checkXML
-%{tde_bindir}/ksvgtopng
-%{tde_bindir}/kunittestmodrunner
-%{tde_bindir}/preparetips
-%{tde_datadir}/icons/hicolor/index.theme
-%{tde_datadir}/locale/all_languages
 %{tde_tdedocdir}/HTML/en/common/*
-%{_sysconfdir}/ld.so.conf.d/trinity.conf
-%else
-%exclude %{tde_bindir}/checkXML
-%exclude %{tde_bindir}/ksvgtopng
-%exclude %{tde_bindir}/kunittestmodrunner
-%exclude %{tde_bindir}/preparetips
-%exclude %{tde_datadir}/config/colors
-%exclude %{tde_datadir}/config/kdebug.areas
-%exclude %{tde_datadir}/config/kdebugrc
-%exclude %{tde_datadir}/config/ksslcalist
-%exclude %{tde_datadir}/config/ui/ui_standards.rc
-%exclude %{tde_datadir}/icons/hicolor/index.theme
-%exclude %{tde_datadir}/locale/all_languages
-%exclude %{tde_tdedocdir}/HTML/en/common/*
-%endif
-
-# Avoid conflict with 'redhat-menus' package
-%if "%{tde_prefix}" == "/usr"
-%{_sysconfdir}/xdg/menus/kde-applications.menu
-%else
-%{tde_prefix}/etc/xdg/menus/kde-applications.menu
-%endif
+%{tde_tdedocdir}/HTML/en/kspell/
 
-# New in TDE 3.5.13
-%{tde_bindir}/kdetcompmgr
+%{_sysconfdir}/xdg/menus/tde-applications.menu
+%{_sysconfdir}/ld.so.conf.d/trinity.conf
 
 %pre
 # TDE Bug #1074
@@ -321,19 +316,6 @@ fi
 
 %post
 /sbin/ldconfig || :
-# Sets default theme as 'crystalsvg'
-update-alternatives --install \
-  %{tde_datadir}/icons/default.kde \
-  default.kde \
-  %{tde_datadir}/icons/crystalsvg \
-  10 || :
-
-%preun
-if [ $1 -eq 0 ]; then
-  update-alternatives --remove \
-    default.kde \
-    %{tde_datadir}/icons/crystalsvg || :
-fi
 
 %postun
 /sbin/ldconfig || :
@@ -364,11 +346,9 @@ applications for TDE.
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
 %{tde_libdir}/*.a
-%exclude %{tde_libdir}/lib[kt]deinit_*.la
-%exclude %{tde_libdir}/lib[kt]deinit_*.so
-
-# New in TDE 3.5.13
-%{tde_datadir}/cmake/[kt]delibs.cmake
+%exclude %{tde_libdir}/libkdeinit_*.la
+%exclude %{tde_libdir}/libkdeinit_*.so
+%{tde_datadir}/cmake/kdelibs.cmake
 
 %post devel
 /sbin/ldconfig || :
@@ -386,12 +366,13 @@ applications for TDE.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .xdg_path
-%patch2 -p1 -b .cups_by_default
+%patch1 -p1 -b .xdg
+%patch101 -p1 -b .xdg_path
+%patch102 -p1 -b .cups_by_default
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR; . /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
@@ -412,6 +393,12 @@ cd build
 %endif
 
 %cmake \
+  -DCMAKE_BUILD_TYPE="" \
+  -DCMAKE_C_FLAGS="-DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="-DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
   -DDOC_INSTALL_DIR="%{tde_docdir}" \
@@ -419,7 +406,8 @@ cd build
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
   -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-  -DCMAKE_SKIP_RPATH=OFF \
+  \
+  -DWITH_ALL_OPTIONS=ON \
   -DWITH_ARTS=ON \
   -DWITH_ALSA=ON \
   -DWITH_LIBART=ON \
@@ -434,9 +422,9 @@ cd build
   %{?with_avahi:-DWITH_AVAHI=ON} \
   %{?!with_pcre:-DWITH_PCRE=OFF} \
   %{?!with_inotify:-DWITH_INOTIFY=OFF} \
-  %{?!with_gamin:-DWITH_GAMIN=OFF} %{?with_gamin:-DWITH_GAMIN=ON} \
+  %{?!with_gamin:-DWITH_GAMIN=OFF} \
   -DWITH_SUDO_KDESU_BACKEND=OFF \
-  %{?with_lzma:-DWITH_LZMA=ON} %{?!with_lzma:-DWITH_LZMA=OFF} \
+  %{?!with_lzma:-DWITH_LZMA=OFF} \
   -DWITH_ASPELL=ON \
   %{?with_hspell:-DWITH_HSPELL=ON} \
   ..
@@ -455,27 +443,21 @@ cat <<EOF >"%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf"
 EOF
 %endif
 
-# Moves the XDG configuration files to TDE directory
-%if "%{tde_prefix}" != "/usr"
-%__install -p -D -m644 \
-  "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
-  "%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu"
-%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
-%else
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
+# Use system-wide CA certificate
+%if "%{?cacert}" != ""
+%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
+%__ln_s "%{cacert}" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
 %endif
 
-# Makes 'default.kde' theme an alternative with 'crystalsvg-updated'
-%__rm -f "%{?buildroot}%{tde_datadir}/icons/default.kde"
-%__ln_s "%{_sysconfdir}/alternatives/default.kde" "%{?buildroot}%{tde_datadir}/icons/default.kde"
-%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives"
-%__ln_s "%{tde_datadir}/icons/crystalsvg" "%{?buildroot}%{_sysconfdir}/alternatives/default.kde"
-
 
 %clean
 %__rm -rf "%{?buildroot}"
 
 
 %changelog
+* Sun Jul 28 2013 Francois Andriot <[email protected]> - 3.5.13.2-2
+- Rebuild with NDEBUG option
+- Fix XDG menu
+
 * Mon Jun 03 2013 Francois Andriot <[email protected]> - 3.5.13.2-1
 - Initial release for TDE 3.5.13.2