From 24f013d747376aa82d3e1428b269359137b8d2af Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Sun, 19 Aug 2012 18:59:10 +0200 Subject: RHEL/Fedora: updates many packaging --- ...ibs-3.5.13-fix_all_languages_installation.patch | 20 ++++++++ ...5.13-prevent_xdg_autostart_multiple_times.patch | 53 ++++++++++++++++++++++ redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 29 ++++++++++-- 3 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch create mode 100644 redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch (limited to 'redhat/kdelibs') diff --git a/redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch b/redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch new file mode 100644 index 000000000..6b0b93760 --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-fix_all_languages_installation.patch @@ -0,0 +1,20 @@ +--- kdelibs/kdecore/CMakeLists.txt.ORI 2012-08-09 21:10:26.125863261 +0200 ++++ kdelibs/kdecore/CMakeLists.txt 2012-08-09 21:12:08.928750681 +0200 +@@ -73,7 +73,8 @@ + + ##### other data ################################ + +-tde_install_empty_directory( ${LOCALE_INSTALL_DIR}/all_languages ) ++install( FILES all_languages.desktop ++ DESTINATION ${LOCALE_INSTALL_DIR} RENAME all_languages ) + + install( FILES 40.colors Web.colors Royal.colors Rainbow.colors + DESTINATION ${CONFIG_INSTALL_DIR}/colors ) +@@ -87,7 +88,6 @@ + install( FILES eventsrc + DESTINATION ${DATA_INSTALL_DIR}/knotify ) + +- + ##### libkdecore ################################ + + set( target kdecore ) diff --git a/redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch b/redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch new file mode 100644 index 000000000..6a5a8c9d4 --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch @@ -0,0 +1,53 @@ +commit e9f29cfb2a76657f150ec585fa6775f372d7e460 +Author: Timothy Pearson +Date: 1343238048 -0500 + + Prevent XDG autostart files from starting multiple times + This resolves Bug 1096 + +diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp +index 4880039..c7feb17 100644 +--- a/kinit/autostart.cpp ++++ b/kinit/autostart.cpp +@@ -214,6 +214,32 @@ AutoStart::loadAutoStartList() + } + m_startList->append(item); + } ++ ++ // Check for duplicate entries and remove if found ++ TQPtrListIterator it1(*m_startList); ++ TQPtrListIterator it2(*m_startList); ++ AutoStartItem *item1; ++ AutoStartItem *item2; ++ while ((item1 = it1.current()) != 0) { ++ bool dupfound1 = false; ++ it2.toFirst(); ++ while ((item2 = it2.current()) != 0) { ++ bool dupfound2 = false; ++ if (item2 != item1) { ++ if (item1->service == item2->service) { ++ m_startList->removeRef(item2); ++ dupfound1 = true; ++ dupfound2 = true; ++ } ++ } ++ if (!dupfound2) { ++ ++it2; ++ } ++ } ++ if (!dupfound1) { ++ ++it1; ++ } ++ } + } + + TQString +@@ -241,7 +267,7 @@ AutoStart::startService() + } + m_started.remove(m_started.begin()); + } +- ++ + // Check for items that don't depend on anything + AutoStartItem *item; + for(item = m_startList->first(); diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 3fdabccf1..2e9004514 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -18,7 +18,7 @@ Name: trinity-tdelibs Version: 3.5.13 -Release: 11%{?dist}%{?_variant} +Release: 12%{?dist}%{?_variant} License: GPL Summary: TDE Libraries Group: Environment/Libraries @@ -89,12 +89,20 @@ Patch32: kdelibs-3.5.13-fix_spinbox_text_entry_when_base_not_10.patch Patch33: kdelibs-3.5.13-update_iso_kioslave_better_handle_large_image.patch ## [tdelibs] Restore tdesu dialog "Keep password" check box default to disabled/unchecked. [Commit #87363770] Patch34: kdelibs-3.5.13-restore_tdesu_keeppassword_default_disabled.patch +## [tdelibs] Fix language switch inside application [Bug #1074] +Patch35: kdelibs-3.5.13-fix_all_languages_installation.patch +## [tdelibs] Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb] +Patch36: kdelibs-3.5.13-prevent_xdg_autostart_multiple_times.patch BuildRequires: cmake >= 2.8 BuildRequires: libtool BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel -BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel +BuildRequires: krb5-devel +BuildRequires: libxslt-devel +BuildRequires: cups-devel +BuildRequires: libart_lgpl-devel +BuildRequires: pcre-devel BuildRequires: libutempter-devel BuildRequires: bzip2-devel BuildRequires: openssl-devel @@ -250,6 +258,12 @@ kimgio (image manipulation). # New in TDE 3.5.13 %{tde_bindir}/kdetcompmgr +%pre +# Bug 1074 +if [ -d %{tde_datadir}/locale/all_languages ]; then + rm -rf %{tde_datadir}/locale/all_languages +fi + %post /sbin/ldconfig || : @@ -319,10 +333,14 @@ applications for TDE. %patch28 -p1 %patch29 -p1 %patch30 -p1 -%patch31 -p1 +%if 0%{?mdkversion} || 0%{?mgaversion} +%patch31 -p1 -b .kled +%endif %patch32 -p1 %patch33 -p1 %patch34 -p1 +%patch35 -p1 +%patch36 -p1 %build @@ -398,6 +416,11 @@ EOF %changelog +* Sat Aug 18 2012 Francois Andriot - 3.5.13-12 +- Fix language switch inside application [Bug #1074] +- Removes patch 'Add ability to set KLed off color [Commit #513ffc6e]' +- Prevent XDG autostart files from starting multiple times [Bug #1096] [Commit #e9f29cfb] + * Sun Jul 22 2012 Francois Andriot - 3.5.13-11 - Fix iso kioslave not parsing large images properly [Commit #b4bba7b5] - Add ability to set KLed off color [Commit #513ffc6e] -- cgit v1.2.3