[leechcraft/f16] Fixing find_qxmpp.patch

Minh Ngo ignotusp at fedoraproject.org
Sat Mar 17 19:12:16 UTC 2012 

commit 6e63b97e0628a0a267fb5aa51d41708ebe2df8ca
Author: Minh Ngo <nlminhtl at gmail.com>
Date:   Sat Mar 17 20:33:10 2012 +0200

    Fixing find_qxmpp.patch

 eiskaltdcpp-fix-php5-issue.patch |   18 ++++++++--------
 find_qxmpp.patch                 |   41 ++++++++++++-------------------------
 leechcraft.spec                  |   32 ++++++++++++++--------------
 3 files changed, 38 insertions(+), 53 deletions(-)
---
diff --git a/eiskaltdcpp-fix-php5-issue.patch b/eiskaltdcpp-fix-php5-issue.patch
index 9e06cfe..cd16887 100644
--- a/eiskaltdcpp-fix-php5-issue.patch
+++ b/eiskaltdcpp-fix-php5-issue.patch
@@ -1,24 +1,24 @@
-diff -ur eiskaltdcpp-2.2.4.orig/eiskaltdcpp-qt/qtscripts/gnome/commands.ru_RU.UTF-8.php eiskaltdcpp-2.2.4/eiskaltdcpp-qt/qtscripts/gnome/commands.ru_RU.UTF-8.php
---- eiskaltdcpp-2.2.4.orig/eiskaltdcpp-qt/qtscripts/gnome/commands.ru_RU.UTF-8.php	2011-10-02 19:12:43.000000000 +0400
-+++ eiskaltdcpp-2.2.4/eiskaltdcpp-qt/qtscripts/gnome/commands.ru_RU.UTF-8.php	2011-12-01 14:17:54.000000000 +0400
+diff -ru ../leechcraft-0.5.60/src/plugins/eiskaltdcpp/eiskaltdcpp-qt/qtscripts/gnome/commands.ru_RU.UTF-8.php ./src/plugins/eiskaltdcpp/eiskaltdcpp-qt/qtscripts/gnome/commands.ru_RU.UTF-8.php
+--- ../leechcraft-0.5.60/src/plugins/eiskaltdcpp/eiskaltdcpp-qt/qtscripts/gnome/commands.ru_RU.UTF-8.php	2012-03-15 11:36:54.000000000 +0200
++++ ./src/plugins/eiskaltdcpp/eiskaltdcpp-qt/qtscripts/gnome/commands.ru_RU.UTF-8.php	2012-03-17 12:48:07.192124658 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/php5
 +#!/usr/bin/php
  <?php
  #------------------------------------------------------------------------------#
  #------------------------------------------------------------------------------#
-diff -ur eiskaltdcpp-2.2.4.orig/examples/commands.ru_RU.UTF-8.php eiskaltdcpp-2.2.4/examples/commands.ru_RU.UTF-8.php
---- eiskaltdcpp-2.2.4.orig/examples/commands.ru_RU.UTF-8.php	2011-10-02 19:12:43.000000000 +0400
-+++ eiskaltdcpp-2.2.4/examples/commands.ru_RU.UTF-8.php	2011-12-01 14:19:04.000000000 +0400
+diff -ru ../leechcraft-0.5.60/src/plugins/eiskaltdcpp/examples/commands.ru_RU.UTF-8.php ./src/plugins/eiskaltdcpp/examples/commands.ru_RU.UTF-8.php
+--- ../leechcraft-0.5.60/src/plugins/eiskaltdcpp/examples/commands.ru_RU.UTF-8.php	2012-03-15 11:36:54.000000000 +0200
++++ ./src/plugins/eiskaltdcpp/examples/commands.ru_RU.UTF-8.php	2012-03-17 12:48:07.165124034 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/php5
 +#!/usr/bin/php
  <?php
  #------------------------------------------------------------------------------#
  #------------------------------------------------------------------------------#
-diff -ur eiskaltdcpp-2.2.4.orig/examples/xmms2_audacious2.ru_RU.UTF-8.php eiskaltdcpp-2.2.4/examples/xmms2_audacious2.ru_RU.UTF-8.php
---- eiskaltdcpp-2.2.4.orig/examples/xmms2_audacious2.ru_RU.UTF-8.php	2011-10-02 19:12:43.000000000 +0400
-+++ eiskaltdcpp-2.2.4/examples/xmms2_audacious2.ru_RU.UTF-8.php	2011-12-01 14:19:28.000000000 +0400
+diff -ru ../leechcraft-0.5.60/src/plugins/eiskaltdcpp/examples/xmms2_audacious2.ru_RU.UTF-8.php ./src/plugins/eiskaltdcpp/examples/xmms2_audacious2.ru_RU.UTF-8.php
+--- ../leechcraft-0.5.60/src/plugins/eiskaltdcpp/examples/xmms2_audacious2.ru_RU.UTF-8.php	2012-03-15 11:36:54.000000000 +0200
++++ ./src/plugins/eiskaltdcpp/examples/xmms2_audacious2.ru_RU.UTF-8.php	2012-03-17 12:48:07.140123453 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/php5
 +#!/usr/bin/php
diff --git a/find_qxmpp.patch b/find_qxmpp.patch
index 26b0c9e..a05bd93 100644
--- a/find_qxmpp.patch
+++ b/find_qxmpp.patch
@@ -1,29 +1,14 @@
---- src/plugins/azoth/plugins/xoox/CMakeLists.txt	2011-07-22 17:05:39.000000000 +0300
-+++ src/plugins/azoth/plugins/xoox/CMakeLists.txt	2011-08-02 13:18:39.313793312 +0300
-@@ -1,14 +1,14 @@
- SET (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+diff -ru ../leechcraft-0.5.60/src/plugins/azoth/plugins/xoox/cmake/FindQXmpp.cmake ./src/plugins/azoth/plugins/xoox/cmake/FindQXmpp.cmake
+--- ../leechcraft-0.5.60/src/plugins/azoth/plugins/xoox/cmake/FindQXmpp.cmake	2012-03-15 11:36:54.000000000 +0200
++++ ./src/plugins/azoth/plugins/xoox/cmake/FindQXmpp.cmake	2012-03-17 19:08:26.974642341 +0200
+@@ -37,7 +37,9 @@
  
--FIND_PACKAGE (QXmpp REQUIRED)
- FIND_PACKAGE (Speex REQUIRED)
- 
- INCLUDE_DIRECTORIES (${AZOTH_INCLUDE_DIR}
- 	${CMAKE_CURRENT_BINARY_DIR}
- 	${CMAKE_CURRENT_SOURCE_DIR}
--	${QXMPP_INCLUDE_DIR}
-+	/usr/include/qxmpp-dev
- 	${QCA2_INCLUDE_DIR}
--	)
-+  )
-+
- SET (XOOX_SRCS
- 	xoox.cpp
- 	glooxprotocol.cpp
-@@ -152,7 +152,7 @@
- TARGET_LINK_LIBRARIES (leechcraft_azoth_xoox
- 	${QT_LIBRARIES}
- 	${LEECHCRAFT_LIBRARIES}
--	${QXMPP_LIBRARIES}
-+   libqxmpp-dev.so
- 	${SPEEX_LIBRARIES}
- 	${QCA2_LIBRARIES}
- 	)
+ IF(QXMPP_LIBRARIES AND QXMPP_INCLUDE_DIR)
+ 	IF(NOT QXMPP_LOCAL)
+-		SET(QXMPP_INCLUDE_DIR "${QXMPP_INCLUDE_DIR}/qxmpp")
++		SET(QXMPP_INCLUDE_DIR
++			${QXMPP_INCLUDE_DIR}/qxmpp
++			${QXMPP_INCLUDE_DIR}/qxmpp-dev)
+ 	ENDIF(NOT QXMPP_LOCAL)
+ 	SET(QXMPP_FOUND 1)
+ ENDIF(QXMPP_LIBRARIES AND QXMPP_INCLUDE_DIR)
diff --git a/leechcraft.spec b/leechcraft.spec
index 9a28517..f3d068e 100644
--- a/leechcraft.spec
+++ b/leechcraft.spec
@@ -6,18 +6,18 @@
 
 Name:           leechcraft 
 Summary:        A Cross-Platform Modular Internet-Client 
-Version:        0.5.0
-Release:        3%{?dist}
+Version:        0.5.60
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          Applications/Internet
 Url:            http://leechcraft.org
-Source0:        http://freefr.dl.sourceforge.net/project/leechcraft/LeechCraft/0.5.0/leechcraft-0.5.0.tar.xz
+Source0:        http://freefr.dl.sourceforge.net/project/leechcraft/LeechCraft/0.5.60/leechcraft-0.5.60.tar.xz
 Source1:        %{name}.desktop
-Patch0:         find_qxmpp.patch
 
 # 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
 Patch2:         defaultstyle.patch
+Patch3:         find_qxmpp.patch
 
 Requires:       %{name}-iconset = %{full_version}
 
@@ -50,7 +50,7 @@ BuildRequires:  rb_libtorrent-devel >= 0.15.6
 BuildRequires:  aspell-devel
 BuildRequires:  aspell
 BuildRequires:  speex-devel
-BuildRequires:  qxmpp-dev-devel >= 0.3.45.1
+BuildRequires:  qxmpp-dev-devel >= 0.3.47
 BuildRequires:  GeoIP-devel 
 BuildRequires:  qca2-devel
 
@@ -794,11 +794,9 @@ This package provides a image viewer for LeechCraft IC.
 
 %prep
 %setup -qn %{name}-%{version}
-pushd src/plugins/eiskaltdcpp/
-%patch1 -p1
-popd
-%patch0
+%patch1
 %patch2
+%patch3
 
 #removing non-free icons
 rm -rf src/plugins/azoth/share/azoth/iconsets/clients/default
@@ -817,7 +815,7 @@ pushd %{_target_platform}
     -DENABLE_FTP=False \
     -DENABLE_POPISHU=True \
     -DENABLE_AZOTH=True \
-    -DENABLE_EISKALTDCPP=True \
+    -DENABLE_EISKALTDCPP=False \
     -DENABLE_SYNCER=True \
     -DENABLE_GLANCE=True \
     -DENABLE_TABSLIST=True \
@@ -831,6 +829,7 @@ pushd %{_target_platform}
     -DENABLE_VFSCORE=False \
     -DENABLE_BLACKDASH=True \
     -DENABLE_CHOROID=True \
+    -DENABLE_LIZNOO=False \
     ../src  
 popd
 make %{?_smp_mflags} -C %{_target_platform} 
@@ -844,8 +843,8 @@ desktop-file-install                                    \
   %{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
+#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
@@ -952,10 +951,11 @@ fi
 %{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

More information about the scm-commits mailing list