[leechcraft/f16: 15/16] Merge branch 'f17' into f16

[Minh Ngo]

commit fb3b06e3955cee4242a704ac19b00e41d418410a
Merge: 6e63b97 6cd74e4
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Sun Mar 18 09:19:03 2012 +0200

    Merge branch 'f17' into f16
    
    Conflicts:
    	eiskaltdcpp-fix-php5-issue.patch
    	leechcraft.spec

 .gitignore                     |    1 +
 leechcraft-for-gcc-4.7.0.patch |  217 +++++++++++++
 leechcraft.spec                |  702 +++++++++++++---------------------------
 sources                        |    2 +-
 4 files changed, 452 insertions(+), 470 deletions(-)
---
diff --cc leechcraft.spec
index f3d068e,7b588a3..113ab85
--- a/leechcraft.spec
+++ b/leechcraft.spec
@@@ -14,12 -14,9 +14,8 @@@ Url:            http://leechcraft.or
  Source0:        http://freefr.dl.sourceforge.net/project/leechcraft/LeechCraft/0.5.60/leechcraft-0.5.60.tar.xz
  Source1:        %{name}.desktop
  
- # PATCH-FIX-UPSTREAM eiskaltdcpp-fix-php5-issue.patch -- Fix install issue caused by installer can't resolve /usr/bin/php5 dependence
- Patch1:         eiskaltdcpp-fix-php5-issue.patch
+ Patch1:         find_qxmpp.patch
  Patch2:         defaultstyle.patch
- Patch3:         find_qxmpp.patch
- 
- Requires:       %{name}-iconset = %{full_version}
 -Patch3:         leechcraft-for-gcc-4.7.0.patch
  
  BuildRequires:  cmake
  BuildRequires:  xz
@@@ -57,6 -56,11 +55,9 @@@ BuildRequires:  qca2-deve
  #for leechcraft-anhero
  BuildRequires:  kdelibs4-devel
  
 -Provides:       leechcraft-eiskaltcpp%{?_isa} = %{full_version}
 -Obsoletes:      leechcraft-eiskaltcpp%{?_isa} < %{full_version}
+ Provides:       leechcraft-tabpp%{?_isa} = %{full_version}
+ Obsoletes:      leechcraft-tabpp%{?_isa} < %{full_version}
+ 
  %description
  Core executable of Leechcraft
  Leechcraft is a free modular "internet client" application.
@@@ -792,11 -544,43 +541,51 @@@ Requires:       %{name}%{?_isa} = %{ful
  %description choroid
  This package provides a image viewer for LeechCraft IC.
  
+ 
+ %package lhtr
+ Summary:        LeechCraft HTML WYSIWYG editor Module
+ Requires:       %{name}%{?_isa} = %{full_version}
+ 
+ %description lhtr
+ HTML WYSIWYG editor module, usable with mail and blog modules.
+ 
+ 
+ %package netstoremanager
+ Summary:        LeechCraft Network file storages Module
+ Requires:       %{name}%{?_isa} = %{full_version}
+ 
+ %description netstoremanager
+ This package contains network storage plugin for Leechcraft.
+ 
+ 
+ %package sidebar
+ Summary:        LeechCraft Sidebar Module
+ Requires:       %{name}%{?_isa} = %{full_version}
+ 
+ %description sidebar
+ A nice side bar with quick launch, tabs and tray areas.
+ 
+ %package tabsessmanager
+ Summary:        LeechCraft Tab Session Manager Module
+ Requires:       %{name}%{?_isa} = %{full_version}
+ 
+ %description tabsessmanager
+ This package contains Tab Session Manager for Leechcraft.
+ 
++%package eiskaltdcpp
++Summary:        LeechCraft DC++ Module
++Requires:       %{name}%{?_isa} = %{full_version}
++
++%description eiskaltdcpp
++DC++ client for LeechCraft.
++
++This package contains EiskaltDC++ DirectConnect client ported to
++LeechCraft.
+ 
  %prep
  %setup -qn %{name}-%{version}
  %patch1
  %patch2
--%patch3
  
  #removing non-free icons
  rm -rf src/plugins/azoth/share/azoth/iconsets/clients/default
@@@ -815,7 -599,7 +604,7 @@@ pushd %{_target_platform
      -DENABLE_FTP=False \
      -DENABLE_POPISHU=True \
      -DENABLE_AZOTH=True \
--    -DENABLE_EISKALTDCPP=False \
++    -DENABLE_EISKALTDCPP=True \
      -DENABLE_SYNCER=True \
      -DENABLE_GLANCE=True \
      -DENABLE_TABSLIST=True \
@@@ -842,14 -630,6 +635,8 @@@ desktop-file-instal
    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
    %{SOURCE1}
  
- rm ${RPM_BUILD_ROOT}%{_datadir}/%{name}/icons/Tango.mapping
- #root_dir=`echo ${RPM_BUILD_ROOT} | sed 's,\/,\\\/,g'`
- #find ${RPM_BUILD_ROOT}%{translations_dir} -name libeiskaltdcpp.mo | sed 's/^.*ions\/\([a-z]*\)\/LC.*/%lang(\1) \0/g;s/'$root_dir'//g' > libeiskaltdcpp.lang
- %find_lang leechcraft --with-qt --without-mo
- %find_lang leechcraft_advancednotifications --with-qt --without-mo
- %find_lang leechcraft_bittorrent --with-qt --without-mo
- %find_lang leechcraft_aggregator --with-qt --without-mo
- %find_lang leechcraft_auscrie --with-qt --without-mo
++root_dir=`echo ${RPM_BUILD_ROOT} | sed 's,\/,\\\/,g'`
++find ${RPM_BUILD_ROOT}%{translations_dir} -name libeiskaltdcpp.mo | sed 's/^.*ions\/\([a-z]*\)\/LC.*/%lang(\1) \0/g;s/'$root_dir'//g' > libeiskaltdcpp.lang
  %find_lang leechcraft_azoth --with-qt --without-mo
  %find_lang leechcraft_azoth_acetamide --with-qt --without-mo
  %find_lang leechcraft_azoth_autopaste --with-qt --without-mo
@@@ -951,12 -744,6 +751,11 @@@ cat leechcraft_netstoremanager*.lang > 
  %{settings_dir}/torrentsettings.xml
  %{plugin_dir}/libleechcraft_bittorrent.so
  
- %files eiskaltdcpp
- #-f libeiskaltdcpp.lang
- #%{_datadir}/%{name}/eiskaltdcpp
- #%{plugin_dir}/libleechcraft_eiskaltdcpp.so
- #%doc %{_mandir}/man1/eiskaltdcpp-qt.1.gz
++%files eiskaltdcpp -f libeiskaltdcpp.lang
++%{_datadir}/%{name}/eiskaltdcpp
++%{plugin_dir}/libleechcraft_eiskaltdcpp.so
++%doc %{_mandir}/man1/eiskaltdcpp-qt.1.gz
 +
  %files aggregator -f leechcraft_aggregator.lang
  %{settings_dir}/aggregatorsettings.xml
  %{plugin_dir}/libleechcraft_aggregator.so