[leechcraft/f16: 13/13] Merge branch 'f17' into f16

[Minh Ngo]

commit 3cfff98ffcc950ecb0b1801d27b0ba2314586351
Merge: fed86ad dffdb67
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Sun Aug 12 10:06:08 2012 +0300

    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore
    	leechcraft.spec
    	sources

 .gitignore                       |    5 +-
 eiskaltdcpp-fix-php5-issue.patch |   27 -------------
 leechcraft.spec                  |   76 +++++++++++++++++++++++++------------
 sources                          |    2 +-
 4 files changed, 55 insertions(+), 55 deletions(-)
---
diff --cc .gitignore
index c5bd930,71ebb8c..7d62f87
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,5 +1,3 @@@
--/leechcraft-0.5.60.tar.xz
--/leechcraft-0.5.65.tar.xz
+ /leechcraft-0.5.70.tar.xz
+ /leechcraft-0.5.75.tar.xz
+ /leechcraft-0.5.80.tar.xz
diff --cc leechcraft.spec
index 9eb0434,2bb5033..ef821bb
--- a/leechcraft.spec
+++ b/leechcraft.spec
@@@ -677,8 -672,6 +670,8 @@@ desktop-file-instal
    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
    %{SOURCE1}
  
- 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
++#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
@@@ -797,21 -802,6 +804,21 @@@ 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 otlozhu -f leechcraft_otlozhu.lang
 +%{plugin_dir}/libleechcraft_otlozhu.so
 +
 +%files dolozhee -f leechcraft_dolozhee.lang
 +%{plugin_dir}/libleechcraft_dolozhee.so
 +
 +%files xproxy -f leechcraft_xproxy.lang
 +%{plugin_dir}/libleechcraft_xproxy.so
 +%{settings_dir}/xproxysettings.xml
 +
  %files aggregator -f leechcraft_aggregator.lang
  %{settings_dir}/aggregatorsettings.xml
  %{plugin_dir}/libleechcraft_aggregator.so