[qutim] Add BRs: qca2-devel, qt-mobility-devel, dbusmenu-qt-devel

Pavel Alexeev hubbitus at fedoraproject.org
Sat Apr 7 18:18:54 UTC 2012


commit e4bae98cb25ea1633bb468e7234607acfabdad55
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Sat Apr 7 22:18:54 2012 +0400

    Add BRs: qca2-devel, qt-mobility-devel, dbusmenu-qt-devel
    
    	for build some plugins.
    - Disable not working Astral plugin (by words of developer).
    - Add patch to work on fresh cmake 2.8.8.

 qutim-0.3.0-cmake-depracated.patch |   24 ++++++++++++++++++++++++
 qutim.spec                         |   16 ++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/qutim-0.3.0-cmake-depracated.patch b/qutim-0.3.0-cmake-depracated.patch
new file mode 100644
index 0000000..182c136
--- /dev/null
+++ b/qutim-0.3.0-cmake-depracated.patch
@@ -0,0 +1,24 @@
+--- protocols/quetzal/CMakeLists.txt	2012-04-07 11:45:57.922564566 -0600
++++ protocols/quetzal/CMakeLists.txt.orig	2012-03-31 13:39:16.000000000 -0600
+@@ -2,10 +2,10 @@
+ PROJECT( Quetzal )
+ 
+ find_package( PkgConfig )
+-if( PKG_CONFIG_FOUND )
++if( PKGCONFIG_FOUND )
+ 	pkg_check_modules( PURPLE purple>=2.6.0 )
+ 	include_directories( ${PURPLE_INCLUDE_DIRS} )
+-else( PKG_CONFIG_FOUND )
++else( PKGCONFIG_FOUND )
+ 	set( PURPLE_INCLUDE_DIR "" CACHE PATH "Path to libpurple include dir" )
+ 	set( PURPLE_LIBRARY "" CACHE FILEPATH "Filepath to libpurple library" )
+ 	set( GLIB_INCLUDE_DIR "" CACHE PATH "Path to glib-2.0 include dir" )
+@@ -16,7 +16,7 @@
+ 	endif()
+ 	include_directories( ${PURPLE_INCLUDE_DIR} ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR} )
+ 	list( APPEND PURPLE_LIBRARIES ${PURPLE_LIBRARY} ${GLIB_LIBRARY} )
+-endif( PKG_CONFIG_FOUND)
++endif( PKGCONFIG_FOUND )
+ 
+ IF (NOT PURPLE_FOUND)
+ 	message( "Libpurple not found. Can't build quetzal" )
diff --git a/qutim.spec b/qutim.spec
index 57e8069..1092ce1 100644
--- a/qutim.spec
+++ b/qutim.spec
@@ -3,7 +3,7 @@
 
 Name:		qutim
 Version:		0.3.0
-Release:		1%{?GIT:.git%{GIT}}%{?dist}
+Release:		2%{?GIT:.git%{GIT}}%{?dist}
 Summary:		Multiprotocol (ICQ, Jabber, IRC etc) instant messenger with modern Qt4 interface
 Summary(ru):	Мультиплатформенный, мультипротокольный (ICQ, Jabber, IRC...) мессенджер на QT4
 License:		GPLv3+ and CC-BY-SA
@@ -23,9 +23,13 @@ Source0:		qutim-0.3.0%{?GIT:.git%{GIT}}.tar.xz
 Source0:		http://qutim.org/downloads/%{name}-%{version}.tar.bz2
 %endif
 
+# This was discussed and made together with upstream author
+Patch0:		qutim-0.3.0-cmake-depracated.patch
+
 Source2:		%{name}.desktop
 #? Requires:		hicolor-icon-theme,
 Requires:		qca-ossl
+BuildRequires:	qca2-devel, qt-mobility-devel, dbusmenu-qt-devel
 BuildRequires:	cmake >= 2.6, desktop-file-utils
 BuildRequires:	qt-devel >= 1:4.7.1, libidn-devel, dos2unix, libpurple-devel
 BuildRequires:	jreen-devel >= 1.0.5, attica-devel, phonon-devel, hunspell-devel
@@ -90,6 +94,8 @@ Headers for %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p0 -b .cdeprecated
+
 # Jreen is shared, do not use bundled
 rm -rf ./protocols/jabber/jreen ./plugins/plugman/3rdparty ./protocols/oscar/3rdparty ./core/3rdparty/qxt
 # ./protocols/mrim/src/3rdparty is not library, just part of code with compatable license and it may be leaved
@@ -106,7 +112,7 @@ rm -rf ./protocols/jabber/jreen ./plugins/plugman/3rdparty ./protocols/oscar/3rd
 
 %build
 # Plugman is not ready, turned off by speak with Elessar
-%{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON -DSYSTEM_JREEN=ON -DPLUGMAN=off .
+%{cmake_kde4} -DCMAKE_SKIP_RPATH:BOOL=ON -DSYSTEM_JREEN=ON -DPLUGMAN=off -DASTRAL=off .
 
 make %{?_smp_mflags}
 
@@ -175,6 +181,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libqutim-adiumwebview.so
 
 %changelog
+* Sat Apr 7 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 0.3.0-2
+- Add BRs: qca2-devel, qt-mobility-devel, dbusmenu-qt-devel
+	for build some plugins.
+- Disable not working Astral plugin (by words of developer).
+- Add patch to work on fresh cmake 2.8.8.
+
 * Sun Apr 1 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 0.3.0-1
 - Long awaited 0.3.0 release!
 - Fixed segfault in Jabber.


More information about the scm-commits mailing list